From 5c1813bf2e2c3181fb946fb9aaaefc89c8e0fe3c Mon Sep 17 00:00:00 2001
From: Joseph Lewis <joehms22@gmail.com>
Date: Tue, 3 Jul 2012 11:11:39 -0600
Subject: [PATCH] LP 1020665

Replaces jsId with data-dojo-id; dojoType with data-dojo-type across
the project.

Signed-off-by: Joseph Lewis <joehms22@gmail.com>
---
 Open-ILS/examples/tt2/flattener_test.tt2           |  10 +-
 .../lib/OpenILS/WWW/TemplateBatchBibUpdate.pm      |  18 +-
 .../templates/acq/common/final_claim_dialog.tt2    |   2 +-
 Open-ILS/src/templates/acq/common/info.tt2         |   4 +-
 Open-ILS/src/templates/acq/common/inv_dialog.tt2   |   4 +-
 Open-ILS/src/templates/acq/common/jubgrid.tt2      |  34 ++--
 Open-ILS/src/templates/acq/common/li_table.tt2     |  88 ++++-----
 Open-ILS/src/templates/acq/common/notes.tt2        |  22 +--
 Open-ILS/src/templates/acq/common/vlagent.tt2      |  14 +-
 Open-ILS/src/templates/acq/currency_type/list.tt2  |  12 +-
 .../src/templates/acq/financial/claim_eligible.tt2 |  10 +-
 Open-ILS/src/templates/acq/fund/list.tt2           |  36 ++--
 Open-ILS/src/templates/acq/fund/view.tt2           |  76 ++++----
 Open-ILS/src/templates/acq/funding_source/list.tt2 |  12 +-
 Open-ILS/src/templates/acq/funding_source/view.tt2 |  58 +++---
 Open-ILS/src/templates/acq/invoice/receive.tt2     |   2 +-
 Open-ILS/src/templates/acq/invoice/view.tt2        |  40 ++---
 Open-ILS/src/templates/acq/lineitem/findbib.tt2    |   8 +-
 Open-ILS/src/templates/acq/lineitem/history.tt2    |   6 +-
 Open-ILS/src/templates/acq/lineitem/related.tt2    |  12 +-
 Open-ILS/src/templates/acq/lineitem/search.tt2     |  38 ++--
 Open-ILS/src/templates/acq/lineitem/worksheet.tt2  |   2 +-
 Open-ILS/src/templates/acq/picklist/bib_search.tt2 |  18 +-
 .../src/templates/acq/picklist/brief_record.tt2    |  10 +-
 Open-ILS/src/templates/acq/picklist/list.tt2       |  38 ++--
 Open-ILS/src/templates/acq/picklist/upload.tt2     |  10 +-
 .../src/templates/acq/picklist/user_request.tt2    |  42 ++---
 Open-ILS/src/templates/acq/picklist/view.tt2       |   2 +-
 Open-ILS/src/templates/acq/po/edi_messages.tt2     |   6 +-
 Open-ILS/src/templates/acq/po/events.tt2           |  30 ++--
 Open-ILS/src/templates/acq/po/history.tt2          |   6 +-
 Open-ILS/src/templates/acq/po/search.tt2           |  16 +-
 Open-ILS/src/templates/acq/po/view.tt2             |  18 +-
 Open-ILS/src/templates/acq/receiving/process.tt2   |  10 +-
 Open-ILS/src/templates/acq/search/unified.tt2      |  40 ++---
 Open-ILS/src/templates/acq/settings/li_attr.tt2    |  30 ++--
 Open-ILS/src/templates/actor/user/register.tt2     |  14 +-
 .../src/templates/actor/user/register_table.tt2    |  12 +-
 .../src/templates/actor/user/trigger_events.tt2    |   8 +-
 Open-ILS/src/templates/base.tt2                    |   8 +-
 Open-ILS/src/templates/booking/pickup.tt2          |   8 +-
 Open-ILS/src/templates/booking/pull_list.tt2       |   4 +-
 Open-ILS/src/templates/booking/reservation.tt2     |   8 +-
 Open-ILS/src/templates/booking/return.tt2          |   8 +-
 Open-ILS/src/templates/cat/authority/list.tt2      |  24 +--
 Open-ILS/src/templates/circ/hold_pull_list.tt2     |  12 +-
 Open-ILS/src/templates/circ/selfcheck/banner.tt2   |   2 +-
 Open-ILS/src/templates/circ/selfcheck/main.tt2     |  10 +-
 .../src/templates/circ/selfcheck/patron_login.tt2  |   4 +-
 Open-ILS/src/templates/circ/selfcheck/payment.tt2  |  26 +--
 .../templates/conify/global/acq/cancel_reason.tt2  |  14 +-
 .../conify/global/acq/claim_event_type.tt2         |  12 +-
 .../templates/conify/global/acq/claim_policy.tt2   |  12 +-
 .../conify/global/acq/claim_policy_action.tt2      |   8 +-
 .../src/templates/conify/global/acq/claim_type.tt2 |  12 +-
 .../conify/global/acq/distribution_formula.tt2     |  26 +--
 .../templates/conify/global/acq/edi_account.tt2    |  16 +-
 .../templates/conify/global/acq/exchange_rate.tt2  |  12 +-
 .../src/templates/conify/global/acq/fund_tag.tt2   |  16 +-
 .../conify/global/acq/invoice_item_type.tt2        |  12 +-
 .../conify/global/acq/invoice_payment_method.tt2   |  12 +-
 .../templates/conify/global/acq/lineitem_alert.tt2 |  14 +-
 .../conify/global/acq/lineitem_marc_attr_def.tt2   |  12 +-
 .../src/templates/conify/global/acq/provider.tt2   | 100 +++++------
 .../src/templates/conify/global/action/survey.tt2  |  36 ++--
 .../templates/conify/global/action/survey/edit.tt2 |   2 +-
 .../global/action_trigger/event_definition.tt2     |  64 +++----
 .../action_trigger/event_definition_data.tt2       |  44 ++---
 .../conify/global/actor/address_alert.tt2          |  18 +-
 .../conify/global/actor/org_unit_custom_tree.tt2   |   4 +-
 .../conify/global/asset/copy_location_group.tt2    |   8 +-
 .../conify/global/asset/copy_location_order.tt2    |  14 +-
 .../conify/global/asset/copy_template.tt2          |  24 +--
 .../conify/global/biblio/monograph_part.tt2        |  12 +-
 .../templates/conify/global/booking/resource.tt2   |  18 +-
 .../conify/global/booking/resource_attr.tt2        |  18 +-
 .../conify/global/booking/resource_attr_map.tt2    |  18 +-
 .../conify/global/booking/resource_attr_value.tt2  |  18 +-
 .../conify/global/booking/resource_type.tt2        |  18 +-
 .../conify/global/cat/authority/browse_axis.tt2    |  12 +-
 .../authority/browse_axis_authority_field_map.tt2  |  12 +-
 .../conify/global/cat/authority/control_set.tt2    |  12 +-
 .../cat/authority/control_set_authority_field.tt2  |  12 +-
 .../global/cat/authority/control_set_bib_field.tt2 |  12 +-
 .../conify/global/cat/authority/thesaurus.tt2      |  12 +-
 .../templates/conify/global/config/acn_prefix.tt2  |  14 +-
 .../templates/conify/global/config/acn_suffix.tt2  |  14 +-
 .../conify/global/config/actor_sip_fields.tt2      |  12 +-
 .../conify/global/config/asset_sip_fields.tt2      |  12 +-
 .../conify/global/config/barcode_completion.tt2    |  12 +-
 .../conify/global/config/billing_type.tt2          |  14 +-
 .../conify/global/config/circ_limit_group.tt2      |  12 +-
 .../conify/global/config/circ_limit_set.tt2        |  14 +-
 .../global/config/circ_matrix_matchpoint.tt2       |  12 +-
 .../conify/global/config/circ_matrix_weights.tt2   |  12 +-
 .../conify/global/config/circ_modifier.tt2         |  14 +-
 .../conify/global/config/coded_value_map.tt2       |  14 +-
 .../templates/conify/global/config/global_flag.tt2 |   8 +-
 .../conify/global/config/hard_due_date.tt2         |  12 +-
 .../conify/global/config/hard_due_date_values.tt2  |  12 +-
 .../global/config/hold_matrix_matchpoint.tt2       |  10 +-
 .../conify/global/config/hold_matrix_weights.tt2   |  12 +-
 .../conify/global/config/idl_field_doc.tt2         |  14 +-
 .../conify/global/config/metabib_field.tt2         |  12 +-
 .../conify/global/config/org_unit_setting_type.tt2 |  14 +-
 .../global/config/record_attr_definition.tt2       |  12 +-
 .../conify/global/config/rule_age_hold_protect.tt2 |  12 +-
 .../conify/global/config/rule_circ_duration.tt2    |  12 +-
 .../conify/global/config/rule_max_fine.tt2         |  12 +-
 .../conify/global/config/rule_recurring_fine.tt2   |  12 +-
 .../templates/conify/global/config/sms_carrier.tt2 |  12 +-
 .../conify/global/config/standing_penalty.tt2      |  12 +-
 .../conify/global/config/usr_activity_type.tt2     |  12 +-
 .../conify/global/config/usr_setting_type.tt2      |  14 +-
 .../conify/global/config/weight_assoc.tt2          |  12 +-
 .../conify/global/config/z3950_source.tt2          |  12 +-
 .../global/permission/grp_penalty_threshold.tt2    |  18 +-
 .../templates/conify/global/vandelay/match_set.tt2 |  18 +-
 .../conify/global/vandelay/match_set_tree.tt2      |   6 +-
 Open-ILS/src/templates/login.tt2                   |   8 +-
 Open-ILS/src/templates/menu.tt2                    |  76 ++++----
 Open-ILS/src/templates/opac/parts/searchbar.tt2    |   2 +-
 .../src/templates/password-reset/request-form.tt2  |   6 +-
 Open-ILS/src/templates/serial/edit_siss.tt2        |   2 +-
 Open-ILS/src/templates/serial/list_item.tt2        |  30 ++--
 Open-ILS/src/templates/serial/list_stream.tt2      |  48 ++---
 .../src/templates/serial/list_subscription.tt2     |  16 +-
 Open-ILS/src/templates/serial/subscription.tt2     |  34 ++--
 .../serial/subscription/caption_and_pattern.tt2    |   8 +-
 .../templates/serial/subscription/distribution.tt2 |  14 +-
 .../src/templates/serial/subscription/issuance.tt2 |  36 ++--
 Open-ILS/src/templates/vandelay/inc/attrs.tt2      |  34 ++--
 Open-ILS/src/templates/vandelay/inc/export.tt2     |  16 +-
 .../src/templates/vandelay/inc/import_errors.tt2   |  20 +--
 Open-ILS/src/templates/vandelay/inc/item_attrs.tt2 |  14 +-
 Open-ILS/src/templates/vandelay/inc/marchtml.tt2   |   4 +-
 Open-ILS/src/templates/vandelay/inc/matches.tt2    |   8 +-
 Open-ILS/src/templates/vandelay/inc/profiles.tt2   |  14 +-
 Open-ILS/src/templates/vandelay/inc/progress.tt2   |   6 +-
 Open-ILS/src/templates/vandelay/inc/queue.tt2      |  62 +++----
 .../src/templates/vandelay/inc/queueselect.tt2     |   2 +-
 Open-ILS/src/templates/vandelay/inc/toolbar.tt2    |  16 +-
 Open-ILS/src/templates/vandelay/inc/upload.tt2     |  36 ++--
 Open-ILS/src/templates/vandelay/vandelay.tt2       |  26 +--
 Open-ILS/web/conify/global/actor/org_unit.html     | 198 ++++++++++-----------
 .../web/conify/global/actor/org_unit_type.html     |  40 ++---
 Open-ILS/web/conify/global/admin.html              |  10 +-
 Open-ILS/web/conify/global/config/copy_status.html |  20 +--
 .../web/conify/global/config/marc_code_maps.html   | 158 ++++++++--------
 .../web/conify/global/permission/grp_tree.html     |  84 ++++-----
 .../web/conify/global/permission/perm_list.html    |  20 +--
 .../web/js/dojo/openils/widget/FacetSidebar.js     |   4 +-
 .../js/dojo/openils/widget/FilteringTreeSelect.js  |   2 +-
 Open-ILS/web/js/dojo/openils/widget/Searcher.js    |  38 ++--
 .../web/js/dojo/openils/widget/TranslatorPopup.js  |   2 +-
 Open-ILS/web/js/ui/default/cat/authority/list.js   |   8 +-
 Open-ILS/web/opac/extras/circ/alt_holds_print.html |   4 +-
 .../web/opac/skin/default/xml/common/fonts.xml     |   4 +-
 .../web/opac/skin/default/xml/common/holds.xml     |   4 +-
 .../web/opac/skin/default/xml/common/searchbar.xml |   2 +-
 .../web/opac/skin/default/xml/common/sidebar.xml   |   2 +-
 .../web/opac/skin/default/xml/home/homesearch.xml  |   4 +-
 .../opac/skin/default/xml/myopac/myopac_holds.xml  |   2 +-
 .../web/opac/skin/default/xml/page_rdetail.xml     |   8 +-
 .../server/admin/org_unit_settings.xhtml           |  58 +++---
 165 files changed, 1617 insertions(+), 1617 deletions(-)

diff --git a/Open-ILS/examples/tt2/flattener_test.tt2 b/Open-ILS/examples/tt2/flattener_test.tt2
index 8f610f646d..d971155595 100644
--- a/Open-ILS/examples/tt2/flattener_test.tt2
+++ b/Open-ILS/examples/tt2/flattener_test.tt2
@@ -6,14 +6,14 @@
     dojo.require("dijit.form.Button");
     dojo.require("openils.widget.FlattenerGrid");
 </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
         <div>Flattener Test</div>
         <div>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="grid.showCreateDialog()">New Thing</button>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="grid.deleteSelected()">Delete Selected Thing</button>
         </div>
     </div>
@@ -25,7 +25,7 @@
     <table
         id="gridNode"
         jsid="grid"
-        dojoType="openils.widget.FlattenerGrid"
+        data-dojo-type="openils.widget.FlattenerGrid"
         columnPersistKey='"conify.flattener_test"'
         autoHeight="10"
         editOnEnter="true"
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
index f72ac17f90..1711b651a1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
@@ -285,7 +285,7 @@ sub show_processing_template {
     </head>
 
     <body style="margin:10px;" class='tundra'>
-        <div class="hide_me"><div dojoType="openils.widget.ProgressDialog" jsId="progress_dialog"></div></div>
+        <div class="hide_me"><div data-dojo-type="openils.widget.ProgressDialog" data-dojo-id="progress_dialog"></div></div>
 
         <table style="width:100%; margin-top:100px;">
             <th>
@@ -497,7 +497,7 @@ sub show_template {
 
     <body style="margin:10px;" class='tundra'>
 
-        <div dojoType="dijit.form.Form" id="myForm" jsId="myForm" encType="multipart/form-data" action="" method="POST">
+        <div data-dojo-type="dijit.form.Form" id="myForm" data-dojo-id="myForm" encType="multipart/form-data" action="" method="POST">
                 <script type='dojo/method' event='onSubmit'>
                     var rec = ruleset_to_record();
 
@@ -519,7 +519,7 @@ sub show_template {
             <input type='hidden' id='template_value' name='template'/>
 
             <label for='inputTypeSelect'>Record source:</label>
-            <select name='recordSource' dojoType='dijit.form.FilteringSelect'>
+            <select name='recordSource' data-dojo-type='dijit.form.FilteringSelect'>
                 <script type='dojo/method' event='onChange' args="val">
                     switch (val) {
                         case 'b':
@@ -554,12 +554,12 @@ sub show_template {
 <!--
                 <tr>
                     <th>Merge template name (optional):</th>
-                    <td><input id='bucketName' jsId='bucketName' type='text' dojoType='dijit.form.TextBox' name='bname' value=''/></td>
+                    <td><input id='bucketName' data-dojo-id='bucketName' type='text' data-dojo-type='dijit.form.TextBox' name='bname' value=''/></td>
                 </tr>
 -->
                 <tr class='' id='bucketListContainer'>
                     <td>Bucket named: 
-                        <div name='containerid' jsId='bucketList' dojoType='dijit.form.FilteringSelect' store='bucketStore' searchAttr='name' id='bucketList'>
+                        <div name='containerid' data-dojo-id='bucketList' data-dojo-type='dijit.form.FilteringSelect' store='bucketStore' searchAttr='name' id='bucketList'>
                             <script type='dojo/method' event='postCreate'>
                                 if (cgi.param('containerid')) this.attr('value',cgi.param('containerid'));
                             </script>
@@ -568,7 +568,7 @@ sub show_template {
                 </tr>
                 <tr class='hide_me' id='csvContainer'>
                     <td>
-                        Column <input style='width:75px;' type='text' dojoType='dijit.form.NumberSpinner' name='idcolumn' value='0' constraints='{min:0,max:100,places:0}' /> of: 
+                        Column <input style='width:75px;' type='text' data-dojo-type='dijit.form.NumberSpinner' name='idcolumn' value='0' constraints='{min:0,max:100,places:0}' /> of: 
                         <input id='idfile' type="file" name="idfile"/>
                         <br/>
                         <br/>
@@ -576,11 +576,11 @@ sub show_template {
                     </td>
                 </tr>
                 <tr class='hide_me' id='recordContainer'>
-                    <td>Record ID: <input dojoType='dijit.form.TextBox' name='recid' style='width:75px;' type='text' value=''/></td>
+                    <td>Record ID: <input data-dojo-type='dijit.form.TextBox' name='recid' style='width:75px;' type='text' value=''/></td>
                 </tr>
             </table>
 
-            <button type="submit" dojoType='dijit.form.Button'>GO!</button> (After setting up your template below.)
+            <button type="submit" data-dojo-type='dijit.form.Button'>GO!</button> (After setting up your template below.)
 
             <br/>
             <br/>
@@ -595,7 +595,7 @@ sub show_template {
             </tr>
         </table>
 
-        <button dojoType='dijit.form.Button'>Add Merge Rule
+        <button data-dojo-type='dijit.form.Button'>Add Merge Rule
             <script type='dojo/connect' event='onClick'>render_from_template()</script>
             <script type='dojo/method' event='postCreate'>render_from_template()</script>
         </button>
diff --git a/Open-ILS/src/templates/acq/common/final_claim_dialog.tt2 b/Open-ILS/src/templates/acq/common/final_claim_dialog.tt2
index 882741cb6d..148458fda0 100644
--- a/Open-ILS/src/templates/acq/common/final_claim_dialog.tt2
+++ b/Open-ILS/src/templates/acq/common/final_claim_dialog.tt2
@@ -2,7 +2,7 @@
     <label for="acq-eligible-claim-type">Claim type:</label>
     <span id="acq-eligible-claim-type"></span>
     <label for="acq-eligible-claim-note">Note:</label>
-    <input dojoType="dijit.form.TextBox" id="acq-eligible-claim-note" />
+    <input data-dojo-type="dijit.form.TextBox" id="acq-eligible-claim-note" />
     <button id="acq-eligible-claim-submit">Claim</button>
 </div>
 
diff --git a/Open-ILS/src/templates/acq/common/info.tt2 b/Open-ILS/src/templates/acq/common/info.tt2
index 6fc5456339..55897bf9c2 100644
--- a/Open-ILS/src/templates/acq/common/info.tt2
+++ b/Open-ILS/src/templates/acq/common/info.tt2
@@ -1,7 +1,7 @@
 [% which_lc = which | lower %]
     <div id="acq-[% which_lc %]-info-div" class="hidden">
         <div class="acq-menu-bar">
-            <div dojoType="dijit.form.Button" id="acq-[% which_lc %]-info-back-button">&#x2196; [% IF which == "Lit" %]Return[% ELSE %]Hide[% END %]</div>
+            <div data-dojo-type="dijit.form.Button" id="acq-[% which_lc %]-info-back-button">&#x2196; [% IF which == "Lit" %]Return[% ELSE %]Hide[% END %]</div>
         </div>
         <table>
             <tbody id="acq-[% which_lc %]-info-tbody">
@@ -16,7 +16,7 @@
             <h3 id="acq-[% which_lc %]-marc-order-record-label">MARC Order Record</h3>
             <h3 id="acq-[% which_lc %]-marc-real-record-label">MARC ILS Record</h3>
             <div>
-                <div dojoType="dijit.form.Button" jsId="acq[% which %]EditOrderMarc" class="hidden">Edit MARC Order Record</div>
+                <div data-dojo-type="dijit.form.Button" data-dojo-id="acq[% which %]EditOrderMarc" class="hidden">Edit MARC Order Record</div>
             </div>
             <div id="acq-[% which_lc %]-marc-div" style="margin-top:20px;"> </div>
         </div>
diff --git a/Open-ILS/src/templates/acq/common/inv_dialog.tt2 b/Open-ILS/src/templates/acq/common/inv_dialog.tt2
index 3bec75cf9a..a3ebc46568 100644
--- a/Open-ILS/src/templates/acq/common/inv_dialog.tt2
+++ b/Open-ILS/src/templates/acq/common/inv_dialog.tt2
@@ -10,7 +10,7 @@
         </th>
         <td>
             <input id="acq-[% which %]-link-invoice-inv_ident"
-                dojoType="dijit.form.TextBox" />
+                data-dojo-type="dijit.form.TextBox" />
         </td>
     </tr>
     <tr>
@@ -24,7 +24,7 @@
     <tr>
         <td colspan="2" style="text-align: center;">
             <button id="acq-[% which %]-link-invoice-link"
-                dojoType="dijit.form.Button" type="submit">Link</button>
+                data-dojo-type="dijit.form.Button" type="submit">Link</button>
         </td>
     </tr>
 </table>
diff --git a/Open-ILS/src/templates/acq/common/jubgrid.tt2 b/Open-ILS/src/templates/acq/common/jubgrid.tt2
index ce13d56449..2152a99223 100644
--- a/Open-ILS/src/templates/acq/common/jubgrid.tt2
+++ b/Open-ILS/src/templates/acq/common/jubgrid.tt2
@@ -36,7 +36,7 @@ pointing to the JUB model (and store) that you have created.
 -#%]
 
 [% UNLESS hide_details %]
-<div dojoType='dijit.layout.ContentPane' style='height:100%;'>
+<div data-dojo-type='dijit.layout.ContentPane' style='height:100%;'>
 [% END %]
 
     <style type='text/css'>
@@ -131,13 +131,13 @@ pointing to the JUB model (and store) that you have created.
     <!-- button bar for lineitems -->
     <script type="text/javascript">JUBGrid.showDetails = true;</script>
     <div id="[% domprefix %]-container" class='container'
-        dojoType="dijit.layout.ContentPane" sizeMin="" sizeShare="">
-        <div dojoType="dijit.layout.ContentPane"
+        data-dojo-type="dijit.layout.ContentPane" sizeMin="" sizeShare="">
+        <div data-dojo-type="dijit.layout.ContentPane"
              id='[% domprefix %]-jub-buttonbar'>
-            <button dojoType="dijit.form.Button" onclick="JUBGrid.approveJUB">
+            <button data-dojo-type="dijit.form.Button" onclick="JUBGrid.approveJUB">
                 Approve Selected Titles
             </button>
-            <button dojoType="dijit.form.Button" onclick="JUBGrid.removeSelectedJUBs">
+            <button data-dojo-type="dijit.form.Button" onclick="JUBGrid.removeSelectedJUBs">
                 Remove Selected Titles
             </button>
         </div>
@@ -147,16 +147,16 @@ pointing to the JUB model (and store) that you have created.
     <div style='height:100%;'>
 [% END %]
         <div structure='JUBGrid.jubGridLayout' jsid='[% grid_jsid %]' class='grid_container'
-            dojoType='dojox.Grid' id="[% domprefix %]-JUB-grid">
+            data-dojo-type='dojox.Grid' id="[% domprefix %]-JUB-grid">
         </div>
     </div>
 [% UNLESS hide_details %]
     <!-- button bar for lineitem details -->
-    <div dojoType="dijit.layout.ContentPane" sizeMin="" sizeShare="" class='container'>
-        <div dojoType="dijit.layout.ContentPane" id='[% domprefix %]-details-buttonbar'>
-            <div dojoType="dijit.form.DropDownButton">
+    <div data-dojo-type="dijit.layout.ContentPane" sizeMin="" sizeShare="" class='container'>
+        <div data-dojo-type="dijit.layout.ContentPane" id='[% domprefix %]-details-buttonbar'>
+            <div data-dojo-type="dijit.form.DropDownButton">
                 <span>New Copy</span>
-                <div dojoType="dijit.TooltipDialog" execute="JUBGrid.createLID(arguments[0]);">
+                <div data-dojo-type="dijit.TooltipDialog" execute="JUBGrid.createLID(arguments[0]);">
                     <script type='dojo/connect' event='onOpen'>
                         new openils.User().buildPermOrgSelector('MANAGE_FUND', copyOwnerSelect);
                         openils.acq.Fund.buildPermFundSelector('MANAGE_FUND', acqlidFund);
@@ -165,14 +165,14 @@ pointing to the JUB model (and store) that you have created.
                         <tr>
                             <td><label for="fund">Fund: </label></td>
                             <td>
-                                <input dojoType="openils.widget.FundSelector"
-                                jsId="acqlidFund" searchAttr="name" autocomplete="true" name="fund"></input>
+                                <input data-dojo-type="openils.widget.FundSelector"
+                                data-dojo-id="acqlidFund" searchAttr="name" autocomplete="true" name="fund"></input>
                             </td>
                         </tr>
                         <tr>
                             <td><label for="owning_lib">Location: </label></td>
-                            <td><input dojoType="openils.widget.OrgUnitFilteringSelect"
-                                jsId="copyOwnerSelect"
+                            <td><input data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+                                data-dojo-id="copyOwnerSelect"
                                 searchAttr="shortname"
                                 name="owning_lib" autocomplete="true"
                                 labelAttr="shortname"></input>
@@ -188,10 +188,10 @@ pointing to the JUB model (and store) that you have created.
                     </table>
                 </div>
             </div>
-            <button dojoType='dijit.form.Button' onclick='JUBGrid.deleteLID'>
+            <button data-dojo-type='dijit.form.Button' onclick='JUBGrid.deleteLID'>
                 Delete Selected Copy
             </button>
-            <button dojoType='dijit.form.Button' onclick='JUBGrid.receiveLID'>
+            <button data-dojo-type='dijit.form.Button' onclick='JUBGrid.receiveLID'>
                 Mark Selected Copies Received
             </button>
         </div>
@@ -200,7 +200,7 @@ pointing to the JUB model (and store) that you have created.
 
     <div style='height:40%;'>
 	    <div class='grid_container'>
-            <div structure='JUBGrid.jubDetailGridLayout' jsid="JUBGrid.jubDetailGrid" dojoType="dojox.Grid"
+            <div structure='JUBGrid.jubDetailGridLayout' jsid="JUBGrid.jubDetailGrid" data-dojo-type="dojox.Grid"
                 id='[% domprefix %]-details-grid'>
             </div>
         </div>
diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2
index 1ec4d17ddd..b79b38417a 100644
--- a/Open-ILS/src/templates/acq/common/li_table.tt2
+++ b/Open-ILS/src/templates/acq/common/li_table.tt2
@@ -34,16 +34,16 @@
                                             <option mask='po' value='po_history'>View PO History</option>
                                         </select>
                                         <span id="acq-lit-export-attr-holder" class="hidden">
-                                            <input dojoType="dijit.form.FilteringSelect" id="acq-lit-export-attr" jsId="acqLitExportAttrSelector" labelAttr="description" searchAttr="description" />
-                                            <span dojoType="dijit.form.Button" jsId="acqLitExportAttrButton">Export List</span>
+                                            <input data-dojo-type="dijit.form.FilteringSelect" id="acq-lit-export-attr" data-dojo-id="acqLitExportAttrSelector" labelAttr="description" searchAttr="description" />
+                                            <span data-dojo-type="dijit.form.Button" data-dojo-id="acqLitExportAttrButton">Export List</span>
                                         </span>
                                         <span id="acq-lit-cancel-reason" class="hidden">
                                             <span id="acq-lit-cancel-reason-selector"></span>
-                                            <span dojoType="dijit.form.Button" jsId="acqLitCancelLineitemsButton">Cancel Line Items</span>
+                                            <span data-dojo-type="dijit.form.Button" data-dojo-id="acqLitCancelLineitemsButton">Cancel Line Items</span>
                                         </span>
                                     </span>
                                     <span id='acq-lit-generic-progress' class='hidden'>
-                                        <span dojoType="dijit.ProgressBar" style="width:300px" jsId="litGenericProgress"></span>
+                                        <span data-dojo-type="dijit.ProgressBar" style="width:300px" data-dojo-id="litGenericProgress"></span>
                                     </span>
                                 </td>
                                 <td>
@@ -158,18 +158,18 @@
             <table style='width:100%'>
                 <tr>
                     <td class="acq-lit-li-menu-left">
-                        <div dojoType='dijit.form.Button' id='acq-lit-copies-back-button' scrollOnFocus='false'>&#x2196; Return</div>
+                        <div data-dojo-type='dijit.form.Button' id='acq-lit-copies-back-button' scrollOnFocus='false'>&#x2196; Return</div>
                         <span style='margin-left:10px;padding-left:10px;border-left:2px solid #aaa;'>
                             Item Count: 
-                            <input dojoType='dijit.form.NumberTextBox' jsId='acqLitCopyCountInput'  
+                            <input data-dojo-type='dijit.form.NumberTextBox' data-dojo-id='acqLitCopyCountInput'  
                                 constraints="{min:0,max:1000,places:0}" style='width:40px' value='0'></input> 
-                            <div dojoType='dijit.form.Button' jsId='acqLitAddCopyCount' scrollOnFocus='false'>Go</div>
+                            <div data-dojo-type='dijit.form.Button' data-dojo-id='acqLitAddCopyCount' scrollOnFocus='false'>Go</div>
                         </span>
                         <span style='margin-left:10px;padding-left:10px;border-left:2px solid #aaa;'>
-                            <div dojoType='dijit.form.Button' jsId='acqLitSaveCopies' scrollOnFocus='false'>Save Changes</div>
+                            <div data-dojo-type='dijit.form.Button' data-dojo-id='acqLitSaveCopies' scrollOnFocus='false'>Save Changes</div>
                         </span>
                         <span id='acq-lit-update-copies-progress' class='hidden'>
-                            <span dojoType="dijit.ProgressBar" style="width:300px" jsId="litUpdateCopiesProgress"></span>
+                            <span data-dojo-type="dijit.ProgressBar" style="width:300px" data-dojo-id="litUpdateCopiesProgress"></span>
                         </span>
                     </td>
                 </tr>
@@ -223,7 +223,7 @@
                     <td><div name='circ_modifier'></div></td>
                     <td><div name='cn_label'></div></td>
                     <td colspan='3' style='text-align:left;'>
-                        <div dojoType='dijit.form.Button' jsId='acqLitBatchUpdateCopies' scrollOnFocus='false'>Batch Update</div>
+                        <div data-dojo-type='dijit.form.Button' data-dojo-id='acqLitBatchUpdateCopies' scrollOnFocus='false'>Batch Update</div>
                     </td>
                 </tr>
             </tbody>
@@ -256,7 +256,7 @@
                     <td><div name='note'></div></td>
                     <td><div name='receiver'></div></td>
                     <td><a href="javascript:void(0);" name="receive">Mark&nbsp;Received</a><a href="javascript:void(0);" name="unreceive">Un-Receive</a>&nbsp;<a href="javascript:void(0);" name="cancel">Cancel</a><span class="hidden" name="cancel_reason"></span>&nbsp;<a href="javascript:void(0);" name="claim">Claim</a></td>
-                    <td><div name='delete' dojoType='dijit.form.Button' style='color:red;' scrollOnFocus='false'>X</div></td>
+                    <td><div name='delete' data-dojo-type='dijit.form.Button' style='color:red;' scrollOnFocus='false'>X</div></td>
                 </tr>
             </tbody>
         </table>
@@ -271,11 +271,11 @@
             <table style='width:100%'>
                 <tr>
                     <td style='text-align:left;'>
-                        <div dojoType='dijit.form.Button' id='acq-lit-real-copies-back-button' scrollOnFocus='false'>&#x2196; Return</div>
+                        <div data-dojo-type='dijit.form.Button' id='acq-lit-real-copies-back-button' scrollOnFocus='false'>&#x2196; Return</div>
                     </td>
                     <td style='text-align:right;'>
                         <span>
-                            <div dojoType='dijit.form.Button' jsId='acqLitSaveRealCopies' scrollOnFocus='false'>Save Changes</div>
+                            <div data-dojo-type='dijit.form.Button' data-dojo-id='acqLitSaveRealCopies' scrollOnFocus='false'>Save Changes</div>
                         </span>
                     </td>
                 </tr>
@@ -306,7 +306,7 @@
     </div>
 
     <div class="hidden">
-        <div jsId="acqLitLinkInvoiceDialog" dojoType="dijit.Dialog">
+        <div data-dojo-id="acqLitLinkInvoiceDialog" data-dojo-type="dijit.Dialog">
             [% INCLUDE "acq/common/inv_dialog.tt2" which = "li" %]
         </div>
     </div>
@@ -320,7 +320,7 @@
                 <tr>
                     <td>
                         <span style='margin-left:10px;'>
-                            <button dojoType="dijit.form.Button" jsId='assetCreatorButton'>[% l('Submit') %]</button>
+                            <button data-dojo-type="dijit.form.Button" data-dojo-id='assetCreatorButton'>[% l('Submit') %]</button>
                         </span>
                     </td>
                 </tr>
@@ -333,7 +333,7 @@
     </div>
 
     <div class='hidden'>
-        <div dojoType='dijit.Dialog' jsId='acqLitPoCreateDialog'>
+        <div data-dojo-type='dijit.Dialog' data-dojo-id='acqLitPoCreateDialog'>
             <table class='oils-generic-table'>
                 <tr>
                     <td>Ordering Agency</td>
@@ -345,23 +345,23 @@
                 </tr>
                 <tr>
                     <td>Prepayment Required</td>
-                    <td><input id="acq-lit-po-prepay" name="prepayment_required" dojoType="dijit.form.CheckBox"/></td>
+                    <td><input id="acq-lit-po-prepay" name="prepayment_required" data-dojo-type="dijit.form.CheckBox"/></td>
                 </tr>
                 <tr>
                     <td>All Lineitems</td>
-                    <td><input checked='checked' name='create_from' value='all' dojoType='dijit.form.RadioButton'/></td>
+                    <td><input checked='checked' name='create_from' value='all' data-dojo-type='dijit.form.RadioButton'/></td>
                 </tr>
                 <tr>
                     <td>Selected Lineitems</td>
-                    <td><input name='create_from' value='selected' dojoType='dijit.form.RadioButton'/></td>
+                    <td><input name='create_from' value='selected' data-dojo-type='dijit.form.RadioButton'/></td>
                 </tr>
                 <tr>
                     <td>Import Bibs and Create Copies</td>
-                    <td><input name='create_assets' dojoType='dijit.form.CheckBox'/></td>
+                    <td><input name='create_assets' data-dojo-type='dijit.form.CheckBox'/></td>
                 </tr>
                 <tr>
                     <td colspan='2'>
-                        <div dojoType='dijit.form.Button' type='submit' jsId='acqLitCreatePoSubmit'>Submit</div>
+                        <div data-dojo-type='dijit.form.Button' type='submit' data-dojo-id='acqLitCreatePoSubmit'>Submit</div>
                     </td>
                 </tr>
             </table>
@@ -369,54 +369,54 @@
     </div>
 
     <div class="hidden">
-        <div dojoType="dijit.Dialog" jsId='acqLitSavePlDialog'>
+        <div data-dojo-type="dijit.Dialog" data-dojo-id='acqLitSavePlDialog'>
             <table class='dijitTooltipTable'>
                 <tr>
                     <td colspan='2'>
-                        <input dojoType="dijit.form.RadioButton" name="which" type='radio' checked='checked' value='selected'/>
+                        <input data-dojo-type="dijit.form.RadioButton" name="which" type='radio' checked='checked' value='selected'/>
                         <label for="name">Save selected</label>
-                        <input dojoType="dijit.form.RadioButton" name="which" type='radio' value='all'/>
+                        <input data-dojo-type="dijit.form.RadioButton" name="which" type='radio' value='all'/>
                         <label for="name">Save all</label>
                     </td>
                 </tr>
                 <tr><td colspan='2'><hr/></td></tr>
                 <tr>
                     <td><label for="new_name">Save as Selection List: </label></td>
-                    <td><input dojoType="dijit.form.TextBox" name="new_name"/></td>
+                    <td><input data-dojo-type="dijit.form.TextBox" name="new_name"/></td>
                 </tr>
                 <tr>
                     <td><label for="existing_pl">Add to Selection List: </label></td>
                     <td>
-                        <input jsId="acqLitAddExistingSelect" dojoType="openils.widget.PCrudAutocompleteBox" fmclass="acqpl" searchAttr="name" name="existing_pl" />
+                        <input data-dojo-id="acqLitAddExistingSelect" data-dojo-type="openils.widget.PCrudAutocompleteBox" fmclass="acqpl" searchAttr="name" name="existing_pl" />
                     </td>
                 </tr>
                 <tr>
                     <td colspan='2' align='center'>
-                        <button dojoType='dijit.form.Button' type="submit" jsId='acqLitSavePlButton'>Save</button>
+                        <button data-dojo-type='dijit.form.Button' type="submit" data-dojo-id='acqLitSavePlButton'>Save</button>
                     </td>
                 </tr>
             </table>
         </div>
 
-        <div dojoType="dijit.Dialog" jsId="lidCancelDialog">
+        <div data-dojo-type="dijit.Dialog" data-dojo-id="lidCancelDialog">
             <label for="acq-lit-lid-cancel-reason">Reason:</label>
             <span id="acq-lit-lid-cancel-reason"></span>
-            <span dojoType="dijit.form.Button"
-                jsId="acqLidCancelButton">Cancel Copy</span>
+            <span data-dojo-type="dijit.form.Button"
+                data-dojo-id="acqLidCancelButton">Cancel Copy</span>
         </div>
-        <div dojoType="dijit.Dialog" jsId="liClaimPolicyDialog">
+        <div data-dojo-type="dijit.Dialog" data-dojo-id="liClaimPolicyDialog">
             <label for="acq-lit-li-claim-policy">Claim policy:</label>
             <span id="acq-lit-li-claim-policy"></span> &nbsp;
-            <span dojoType="dijit.form.Button"
-                jsId="liClaimPolicySave">Save</span>
+            <span data-dojo-type="dijit.form.Button"
+                data-dojo-id="liClaimPolicySave">Save</span>
         </div>
-        <div dojoType="dijit.Dialog" jsId="liClaimDialog">
+        <div data-dojo-type="dijit.Dialog" data-dojo-id="liClaimDialog">
             [% INCLUDE "acq/common/claim_dialog.tt2" %]
         </div>
-        <div dojoType="dijit.Dialog" jsId="finalClaimDialog">
+        <div data-dojo-type="dijit.Dialog" data-dojo-id="finalClaimDialog">
             [% INCLUDE "acq/common/final_claim_dialog.tt2" %]
         </div>
-        <div dojoType="dijit.Dialog" jsId="batchFundUpdateDialog" title="Batch Update Funds">
+        <div data-dojo-type="dijit.Dialog" data-dojo-id="batchFundUpdateDialog" title="Batch Update Funds">
             <div>
                 This will update the fund for all copies attached to these lineitems.<br/>
                 This will also update any existing encumbered or spent debits.
@@ -432,27 +432,27 @@
                     </td>
                 </tr>
                 <tr>
-                    <td><button dojoType='dijit.form.Button' jsId='batchFundUpdateCancel'>Cancel</button></td>
-                    <td><button dojoType='dijit.form.Button' jsId='batchFundUpdateSubmit'>Submit</button></td>
+                    <td><button data-dojo-type='dijit.form.Button' data-dojo-id='batchFundUpdateCancel'>Cancel</button></td>
+                    <td><button data-dojo-type='dijit.form.Button' data-dojo-id='batchFundUpdateSubmit'>Submit</button></td>
                 </tr>
             </table>
         </div>
     </div>
 
-    <div dojoType="dijit.Dialog" jsId='acqLitChangeLiStateDialog'>
+    <div data-dojo-type="dijit.Dialog" data-dojo-id='acqLitChangeLiStateDialog'>
         <table class='dijitTooltipTable'>
             <tr>
                 <td>
-                    <input dojoType="dijit.form.RadioButton" name="which" type='radio' checked='checked' value='selected'/>
+                    <input data-dojo-type="dijit.form.RadioButton" name="which" type='radio' checked='checked' value='selected'/>
                     <label for="name">Mark selected</label>
-                    <input dojoType="dijit.form.RadioButton" name="which" type='radio' value='all'/>
+                    <input data-dojo-type="dijit.form.RadioButton" name="which" type='radio' value='all'/>
                     <label for="name">Mark all</label>
                 </td>
             </tr>
             <tr>
                 <td colspan='2' align='center'>
-                    <button dojoType='dijit.form.Button' type="submit" jsId='acqLitCancelLiStateButton'>Cancel</button>
-                    <button dojoType='dijit.form.Button' type="submit" jsId='acqLitSaveLiStateButton'>Go</button>
+                    <button data-dojo-type='dijit.form.Button' type="submit" data-dojo-id='acqLitCancelLiStateButton'>Cancel</button>
+                    <button data-dojo-type='dijit.form.Button' type="submit" data-dojo-id='acqLitSaveLiStateButton'>Go</button>
                 </td>
             </tr>
         </table>
@@ -460,7 +460,7 @@
 
 
     <div class='hidden'>
-        <div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div>
+        <div data-dojo-type='openils.widget.ProgressDialog' data-dojo-id='progressDialog'></div>
     </div>
 
 </div>
diff --git a/Open-ILS/src/templates/acq/common/notes.tt2 b/Open-ILS/src/templates/acq/common/notes.tt2
index 609cf6c812..07a4672f12 100644
--- a/Open-ILS/src/templates/acq/common/notes.tt2
+++ b/Open-ILS/src/templates/acq/common/notes.tt2
@@ -4,34 +4,34 @@
             <table style="width:100%">
                 <tr>
                     <td style="text-align:left;">
-                        <div dojoType="dijit.form.Button" id="acq-[% which_lc %]-notes-back-button">&#x2196; Return</div>
+                        <div data-dojo-type="dijit.form.Button" id="acq-[% which_lc %]-notes-back-button">&#x2196; Return</div>
                     </td>
                     <td style="text-align:right;">
-                        <div dojoType="dijit.form.DropDownButton">
+                        <div data-dojo-type="dijit.form.DropDownButton">
                             <span>New Note</span>
-                            <div dojoType="dijit.TooltipDialog">
+                            <div data-dojo-type="dijit.TooltipDialog">
                                 <div class="acq-notes-note-row">
-                                    <div jsId="acq[% which %]CreateNoteText" dojoType="dijit.form.Textarea" style="height:5em; width:25em;" name="note"></div>
+                                    <div data-dojo-id="acq[% which %]CreateNoteText" data-dojo-type="dijit.form.Textarea" style="height:5em; width:25em;" name="note"></div>
                                     <div style="margin: 8px 0;">
-                                        <div dojoType="dijit.form.CheckBox" jsId="acq[% which %]CreateNoteVendorPublic" name="vendor_public" id="acq-[% which_lc %]-create-note-vendor-public"></div><label for="acq-[% which_lc %]-create-note-vendor-public">Note is vendor-public</label>
+                                        <div data-dojo-type="dijit.form.CheckBox" data-dojo-id="acq[% which %]CreateNoteVendorPublic" name="vendor_public" id="acq-[% which_lc %]-create-note-vendor-public"></div><label for="acq-[% which_lc %]-create-note-vendor-public">Note is vendor-public</label>
                                     </div>
                                 </div>
-                                <button jsId="acq[% which %]CreateNoteSubmit" dojoType="dijit.form.Button" type="submit">Create</button>
+                                <button data-dojo-id="acq[% which %]CreateNoteSubmit" data-dojo-type="dijit.form.Button" type="submit">Create</button>
                             </div>
                         </div>
 [% IF which == "Lit" %]
-                        <div dojoType="dijit.form.DropDownButton">
+                        <div data-dojo-type="dijit.form.DropDownButton">
                             <span>New Alert</span>
-                            <div dojoType="dijit.TooltipDialog">
+                            <div data-dojo-type="dijit.TooltipDialog">
                                 <div class="acq-notes-note-row">
                                     <label for="acq-lit-alert-alert-text">Choose alert code &nbsp;&nbsp;</label>
-                                    <input id="acq-lit-alert-alert-text" jsId="acqLitAlertAlertText" dojoType="dijit.form.FilteringSelect" labelAttr="code" searchAttr="code" required="true" />
+                                    <input id="acq-lit-alert-alert-text" data-dojo-id="acqLitAlertAlertText" data-dojo-type="dijit.form.FilteringSelect" labelAttr="code" searchAttr="code" required="true" />
                                 </div>
                                 <div class="acq-notes-note-row">
                                     <label for="acq-lit-alert-value">Additional comments</label>
-                                    <div jsId="acqLitAlertNoteValue" id="acq-lit-alert-value" dojoType="dijit.form.Textarea" name="value"></div>
+                                    <div data-dojo-id="acqLitAlertNoteValue" id="acq-lit-alert-value" data-dojo-type="dijit.form.Textarea" name="value"></div>
                                 </div>
-                                <button jsId="acqLitCreateAlertSubmit" dojoType="dijit.form.Button" type="submit">Create</button>
+                                <button data-dojo-id="acqLitCreateAlertSubmit" data-dojo-type="dijit.form.Button" type="submit">Create</button>
                             </div>
                         </div>
 [% END %]
diff --git a/Open-ILS/src/templates/acq/common/vlagent.tt2 b/Open-ILS/src/templates/acq/common/vlagent.tt2
index 8d5ede7954..0378d9f44c 100644
--- a/Open-ILS/src/templates/acq/common/vlagent.tt2
+++ b/Open-ILS/src/templates/acq/common/vlagent.tt2
@@ -4,7 +4,7 @@
         <td><div id='acq_vl:existing_queue'></div></td>
         <td>
             <span>[% l('Or create a new queue') %]</span>
-            <input dojoType='dijit.form.TextBox' id='acq_vl:queue_name' size='32'></input>
+            <input data-dojo-type='dijit.form.TextBox' id='acq_vl:queue_name' size='32'></input>
         </td>
     </tr>
     <tr>
@@ -17,25 +17,25 @@
     </tr>
     <tr>
         <td>[% l('Import Non-Matching Records') %]</td>
-        <td><input dojoType='dijit.form.CheckBox' id='acq_vl:import_no_match'></input></td>
+        <td><input data-dojo-type='dijit.form.CheckBox' id='acq_vl:import_no_match'></input></td>
         <td><span style='padding-right:10px;'>[% l('Record Source') %]</span> <div id='acq_vl:bib_source'></div></td>
     </tr>
     <tr>
         <td>[% l('Merge On Exact Match (901c)') %]</td>
-        <td><input dojoType='dijit.form.CheckBox' id='acq_vl:auto_overlay_exact'></input></td>
+        <td><input data-dojo-type='dijit.form.CheckBox' id='acq_vl:auto_overlay_exact'></input></td>
     </tr>
     <tr>
         <td>[% l('Merge On Single Match') %]</td>
-        <td><input dojoType='dijit.form.CheckBox' id='acq_vl:auto_overlay_1match'></input></td>
+        <td><input data-dojo-type='dijit.form.CheckBox' id='acq_vl:auto_overlay_1match'></input></td>
     </tr>
     <tr>
         <td>[% l('Merge On Best Match') %]</td>
-        <td><input dojoType='dijit.form.CheckBox' id='acq_vl:auto_overlay_best_match'></input></td>
+        <td><input data-dojo-type='dijit.form.CheckBox' id='acq_vl:auto_overlay_best_match'></input></td>
     </tr>
     <tr>
         <td>[% l('Best/Single Match Minimum Quality Ratio') %]</td>
         <td colspan='4'>
-            <input style='width:3em' value='0.0' id='acq_vl:match_quality_ratio' dojoType='dijit.form.TextBox'/>
+            <input style='width:3em' value='0.0' id='acq_vl:match_quality_ratio' data-dojo-type='dijit.form.TextBox'/>
             <span style='padding-left: 10px; font-size:90%'>[% l('New Record Quality / Quality of Best Match') %]</span>
         </td>
     </tr>
@@ -46,7 +46,7 @@
     [% IF vl_show_copy_option %]
     <tr>
         <td>[% l('Load Items for Imported Records') %]</td>
-        <td><input dojoType='dijit.form.CheckBox' id='acq_vl:create_assets'></input></td>
+        <td><input data-dojo-type='dijit.form.CheckBox' id='acq_vl:create_assets'></input></td>
     </tr>
     [% END %]
 [% END %]
diff --git a/Open-ILS/src/templates/acq/currency_type/list.tt2 b/Open-ILS/src/templates/acq/currency_type/list.tt2
index dfa5d2d4d5..5c8fae5a6d 100644
--- a/Open-ILS/src/templates/acq/currency_type/list.tt2
+++ b/Open-ILS/src/templates/acq/currency_type/list.tt2
@@ -1,15 +1,15 @@
 [% WRAPPER base.tt2 %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
     <div>Currency Type</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='ctGrid.showCreateDialog()'>New Currency Type</button>
-        <button dojoType='dijit.form.Button' onClick='ctGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='ctGrid.showCreateDialog()'>New Currency Type</button>
+        <button data-dojo-type='dijit.form.Button' onClick='ctGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="ctGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="ctGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['code', 'label']"
             defaultCellWidth='25'
             query="{code: '*'}"
diff --git a/Open-ILS/src/templates/acq/financial/claim_eligible.tt2 b/Open-ILS/src/templates/acq/financial/claim_eligible.tt2
index fc8784259d..4541872456 100644
--- a/Open-ILS/src/templates/acq/financial/claim_eligible.tt2
+++ b/Open-ILS/src/templates/acq/financial/claim_eligible.tt2
@@ -6,11 +6,11 @@
     <div class="oils-acq-basic-roomy">
         Show items ready to claim for:
         <select
-            dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId="orderingAgency" searchAttr="shortname"
+            data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id="orderingAgency" searchAttr="shortname"
             labelAttr="shortname"></select>
-        <span dojoType="openils.widget.ProgressDialog"
-            jsId="progressDialog"></span>
+        <span data-dojo-type="openils.widget.ProgressDialog"
+            data-dojo-id="progressDialog"></span>
     </div>
     <div class="oils-acq-basic-roomy">
         <button name="claim_submit">Claim selected items</button>
@@ -48,7 +48,7 @@
     </div>
 </div>
 <div class="hidden">
-    <div dojoType="dijit.Dialog" jsId="finalClaimDialog">
+    <div data-dojo-type="dijit.Dialog" data-dojo-id="finalClaimDialog">
         [% INCLUDE "acq/common/final_claim_dialog.tt2" %]
     </div>
 </div>
diff --git a/Open-ILS/src/templates/acq/fund/list.tt2 b/Open-ILS/src/templates/acq/fund/list.tt2
index 95eac5fe45..978ea6d1c8 100644
--- a/Open-ILS/src/templates/acq/fund/list.tt2
+++ b/Open-ILS/src/templates/acq/fund/list.tt2
@@ -38,12 +38,12 @@
         <td style='text-align:left;font-size:130%;font-weight: bold;'>Funds</td>
         <td style='text-align:right;width:90%;'>
 
-            <button dojoType='dijit.form.Button' onClick='createNewFund()'>New Fund</button>
-            <button dojoType='dijit.form.Button' onClick='lfGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='createNewFund()'>New Fund</button>
+            <button data-dojo-type='dijit.form.Button' onClick='lfGrid.deleteSelected()'>Delete Selected</button>
 
-            <div dojoType="dijit.form.DropDownButton">
+            <div data-dojo-type="dijit.form.DropDownButton">
                 <span>Fund Propagation &amp; Rollover</span>
-                <div dojoType="dijit.TooltipDialog" execute="performRollover(arguments[0]);">
+                <div data-dojo-type="dijit.TooltipDialog" execute="performRollover(arguments[0]);">
                     <table class='dijitTooltipTable' id='oils-acq-rollover-tooltip-table'>
                         <tr>
                             <td colspan='2'>
@@ -58,7 +58,7 @@
                         <tr>
                             <td><label for="rollover">Perform Fiscal Year Close-out Operation: </label></td>
                             <td>
-                                <input dojoType="dijit.form.CheckBox" name="rollover"> </input>
+                                <input data-dojo-type="dijit.form.CheckBox" name="rollover"> </input>
                             </td>
                         </tr>
                         <tr>
@@ -78,12 +78,12 @@
                         </tr>
                         <tr>
                             <td>Include Funds for Descendant Org Units:</td>
-                            <td><input dojoType=dijit.form.CheckBox name='child_orgs'/></td>
+                            <td><input data-dojo-type=dijit.form.CheckBox name='child_orgs'/></td>
                         </tr>
                         <tr>
                             <td><label for="dry_run">Dry Run: </label></td>
                             <td>
-                                <input dojoType="dijit.form.CheckBox" name="dry_run" checked='checked'> </input>
+                                <input data-dojo-type="dijit.form.CheckBox" name="dry_run" checked='checked'> </input>
                             </td>
                         </tr>
                         <tr>
@@ -97,7 +97,7 @@
                         </tr>
                         <tr>
                             <td colspan='2' align='center'>
-                                <button dojoType=dijit.form.Button type="submit">Process</button>
+                                <button data-dojo-type=dijit.form.Button type="submit">Process</button>
                             </td>
                         </tr>
                     </table>
@@ -110,23 +110,23 @@
 <div class="oils-acq-basic-roomy">
     <span>Context Org Unit</span>
     <select
-        dojoType="openils.widget.OrgUnitFilteringSelect"
-        jsId="contextOrgSelector"
+        data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+        data-dojo-id="contextOrgSelector"
         searchAttr="shortname"
         labelAttr="shortname">
     </select>
 
     <span>Year</span>
-    <select dojoType="dijit.form.FilteringSelect"
-        jsId="fundFilterYearSelect"
+    <select data-dojo-type="dijit.form.FilteringSelect"
+        data-dojo-id="fundFilterYearSelect"
         labelAttr="year"
         searchAttr="year">
     </select>
 
-    <div dojoType='dijit.form.Button' jsId='refreshButton'>Refresh</div>
+    <div data-dojo-type='dijit.form.Button' data-dojo-id='refreshButton'>Refresh</div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <div id='acq-fund-list-rollover-summary-wrapper'>
         <div id='acq-fund-list-rollover-summary' class='hidden'>
             <div id='acq-fund-list-rollover-summary-header'> </div>
@@ -139,9 +139,9 @@
     </div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:80%'>
-    <table  jsId="lfGrid"
-            dojoType="openils.widget.AutoGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:80%'>
+    <table  data-dojo-id="lfGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['id', 'name', 'code', 'year', 'org', 'currency_type', 'combined_balance']"
             requiredFields="['name', 'code', 'year', 'org', 'currency_type']"
             query="{id: '*'}"
@@ -157,6 +157,6 @@
         </thead>
     </table>
 </div>
-<div dojoType="openils.widget.ProgressDialog" jsId="progressDialog"></div>
+<div data-dojo-type="openils.widget.ProgressDialog" data-dojo-id="progressDialog"></div>
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/list_funds.js'> </script>
 [% END %]
diff --git a/Open-ILS/src/templates/acq/fund/view.tt2 b/Open-ILS/src/templates/acq/fund/view.tt2
index 7eb63e3c91..0d844511fd 100644
--- a/Open-ILS/src/templates/acq/fund/view.tt2
+++ b/Open-ILS/src/templates/acq/fund/view.tt2
@@ -7,9 +7,9 @@
 
 <div class='oils-acq-actions-div' style='margin:8px;'> <!-- XXX CSS -->
     <!-- Dropdown menu for creating a new funding source credit -->
-    <div dojoType="dijit.form.DropDownButton">
+    <div data-dojo-type="dijit.form.DropDownButton">
         <span>Create Allocation</span>
-        <div dojoType="dijit.TooltipDialog" execute="createAllocation(arguments[0]);">
+        <div data-dojo-type="dijit.TooltipDialog" execute="createAllocation(arguments[0]);">
             <script type='dojo/connect' event='onOpen'>
                 openils.acq.FundingSource.createStore(
                     function(store) {
@@ -24,15 +24,15 @@
                 <tr>
                     <td><label for="amount">Funding Source: </label></td>
                     <td>
-                        <input jsId='fundingSourceSelector' name="funding_source" 
-                               dojoType="dijit.form.FilteringSelect" searchAttr='code' labelAttr='code'>
+                        <input data-dojo-id='fundingSourceSelector' name="funding_source" 
+                               data-dojo-type="dijit.form.FilteringSelect" searchAttr='code' labelAttr='code'>
                         </input>
                     </td>
                 </tr>
                 <tr>
                     <td><label for="amount">Amount: </label></td>
                     <td>
-                        <input dojoType="dijit.form.CurrencyTextBox" name="amount"> </input>
+                        <input data-dojo-type="dijit.form.CurrencyTextBox" name="amount"> </input>
                     </td>
                 </tr>
 
@@ -41,7 +41,7 @@
                     <td><label for="amount">Percent: </label></td>
                     <td>
                         <input 
-                             dojoType="dijit.form.NumberTextBox" 
+                             data-dojo-type="dijit.form.NumberTextBox" 
                              constraints="{min:0,max:100}" 
                              promptMessage="Please enter an amount between 0 and 100"
                              name="percent"> 
@@ -53,20 +53,20 @@
                 <tr>
                     <td><label for="note">Note: </label></td>
                     <td>
-                        <input dojoType="dijit.form.TextBox" name="note"> </input>
+                        <input data-dojo-type="dijit.form.TextBox" name="note"> </input>
                     </td>
                 </tr>
                 <tr>
                     <td colspan='2' align='center'>
-                        <button dojoType="dijit.form.Button" type="submit">Apply</button>
+                        <button data-dojo-type="dijit.form.Button" type="submit">Apply</button>
                     </td>
                 </tr>
             </table>
         </div>
     </div> 
-    <div dojoType="dijit.form.DropDownButton">
+    <div data-dojo-type="dijit.form.DropDownButton">
         <span>Transfer Money</span>
-        <div jsId="xferDialog" dojoType="dijit.TooltipDialog">
+        <div data-dojo-id="xferDialog" data-dojo-type="dijit.TooltipDialog">
             <script type="dojo/connect" event="onOpen">
                 /* If a fund is selected (from a previous time that the
                 user popped open this dialog), unselect it. Wouldn't want to
@@ -85,7 +85,7 @@
                         </label>
                     </th>
                     <td>
-                        <input dojoType="dijit.form.CurrencyTextBox"
+                        <input data-dojo-type="dijit.form.CurrencyTextBox"
                             id="oils-acq-fund-xfer-o-amount"
                             name="o_amount" />
                     </td>
@@ -109,7 +109,7 @@
                     <td>
                         <div class="oils-acq-basic-roomy">
                             <input id="oils-acq-fund-xfer-same-o-d"
-                                dojoType="dijit.form.CheckBox" checked="checked"
+                                data-dojo-type="dijit.form.CheckBox" checked="checked"
                                 value="1" name="same_o_d" />
                             <label for="oils-acq-fund-xfer-same-o-d">
                                 Same as source amount?
@@ -117,7 +117,7 @@
                         </div>
                         <div class="oils-acq-basic-roomy">
                             <input id="oils-acq-fund-xfer-d-amount"
-                                dojoType="dijit.form.CurrencyTextBox"
+                                data-dojo-type="dijit.form.CurrencyTextBox"
                                 name="d_amount" disabled="disabled" />
                         </div>
                     </td>
@@ -127,14 +127,14 @@
                         <label for="oils-acq-fund-xfer-note">Note</label>
                     </th>
                     <td>
-                        <input dojoType="dijit.form.TextBox" name="note"
+                        <input data-dojo-type="dijit.form.TextBox" name="note"
                             id="oils-acq-fund-xfer-note" />
                     </td>
                 </tr>
                 <tr>
                     <td colspan="2" id="oils-acq-fund-xfer-submit-row">
                         <button onclick="xferManager.submit();"
-                            dojoType="dijit.form.Button" type="submit">
+                            data-dojo-type="dijit.form.Button" type="submit">
                             Transfer
                         </button>
                     </td>
@@ -145,16 +145,16 @@
 </div>
 
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top">
-    <div dojoType="dijit.layout.TabContainer">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top">
+    <div data-dojo-type="dijit.layout.TabContainer">
 
         <!-- Fund Summary -->
-        <div dojoType="dijit.layout.ContentPane" 
+        <div data-dojo-type="dijit.layout.ContentPane" 
              class='oils-acq-detail-content-pane' title="Summary" selected='true'>
             
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top"> 
-                <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:600px;'> 
-                    <table jsId="fundGrid" dojoType="dojox.grid.DataGrid" query="{id: '*'}" rowSelector='20px'> 
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top"> 
+                <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:600px;'> 
+                    <table data-dojo-id="fundGrid" data-dojo-type="dojox.grid.DataGrid" query="{id: '*'}" rowSelector='20px'> 
                         <thead> 
                             <tr> 
                                 <th field="id">ID</th> 
@@ -176,16 +176,16 @@
         </div>
 
         <!-- Fund Allocations -->
-        <div dojoType="dijit.layout.ContentPane" class='oils-acq-detail-content-pane' title="Allocations">
+        <div data-dojo-type="dijit.layout.ContentPane" class='oils-acq-detail-content-pane' title="Allocations">
             <script type='dojo/connect' event='onShow'>loadAllocationGrid();</script>
             
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top"> 
-                <div dojoType="dijit.layout.ContentPane" layoutAlign="client"> 
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top"> 
+                <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client"> 
 
                     <table 
-                        jsId="fundAllocationGrid" 
+                        data-dojo-id="fundAllocationGrid" 
                         autoHeight='true'
-                        dojoType="openils.widget.AutoGrid"
+                        data-dojo-type="openils.widget.AutoGrid"
                         fieldOrder="['funding_source', 'amount', 'create_time', 'allocator', 'note']"
                         suppressFields="['id', 'fund']"
                         defaultCellWidth='"auto"'
@@ -204,17 +204,17 @@
         </div>
 
         <!--- Fund Debits -->
-        <div dojoType="dijit.layout.ContentPane" class='oils-acq-detail-content-pane' title="Debits">
+        <div data-dojo-type="dijit.layout.ContentPane" class='oils-acq-detail-content-pane' title="Debits">
             <script type='dojo/connect' event='onShow'>loadDebitGrid();</script>
             
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top" style='height:600px;'> 
-                <button dojoType="dijit.form.Button" onClick="fundDebitGrid.refresh();">Refresh Grid</button>
-                <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" style='height:600px;'> 
+                <button data-dojo-type="dijit.form.Button" onClick="fundDebitGrid.refresh();">Refresh Grid</button>
+                <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
 
                     <table 
-                        jsId="fundDebitGrid" 
+                        data-dojo-id="fundDebitGrid" 
                         autoHeight='true'
-                        dojoType="openils.widget.AutoGrid"
+                        data-dojo-type="openils.widget.AutoGrid"
                         fieldOrder="['amount', 'encumbrance', 'debit_type', 'origin_amount', 'origin_currency_type']"
                         suppressFields="['id', 'fund']"
                         defaultCellWidth='"auto"'
@@ -226,21 +226,21 @@
             </div> 
         </div>
 
-        <div dojoType="dijit.layout.ContentPane" class="oils-acq-detail-content-pane" title="Tags">
+        <div data-dojo-type="dijit.layout.ContentPane" class="oils-acq-detail-content-pane" title="Tags">
             <script type="dojo/connect" event="onShow">
                 tagManager.displayFund(fund);
             </script>
             <div id="oils-acq-tag-manager-display"></div>
             <div id="oils-acq-tag-manager-add">
-                <div dojoType="dijit.form.DropDownButton">
+                <div data-dojo-type="dijit.form.DropDownButton">
                     <span>Add Tag</span>
-                    <div dojoType="dijit.TooltipDialog">
-                        <select dojoType="dijit.form.FilteringSelect"
-                            jsId="tagSelector">
+                    <div data-dojo-type="dijit.TooltipDialog">
+                        <select data-dojo-type="dijit.form.FilteringSelect"
+                            data-dojo-id="tagSelector">
                         </select>
                         <button onclick="tagManager.addMapping(
                             fund, new acqft().fromStoreItem(tagSelector.item)
-                        );" type="submit" dojoType="dijit.form.Button">
+                        );" type="submit" data-dojo-type="dijit.form.Button">
                             Add
                         </button>
                     </div>
diff --git a/Open-ILS/src/templates/acq/funding_source/list.tt2 b/Open-ILS/src/templates/acq/funding_source/list.tt2
index 432c471ecb..61a34fea12 100644
--- a/Open-ILS/src/templates/acq/funding_source/list.tt2
+++ b/Open-ILS/src/templates/acq/funding_source/list.tt2
@@ -18,18 +18,18 @@
     }
 </script>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
 
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Funding Sources</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='fsGrid.showCreateDialog()'>New Funding Source</button>
-            <button dojoType='dijit.form.Button' onClick='fsGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='fsGrid.showCreateDialog()'>New Funding Source</button>
+            <button data-dojo-type='dijit.form.Button' onClick='fsGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
 
-    <table  jsId="fsGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="fsGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['id', 'name', 'owner', 'code', 'currency_type', 'balance']"
             query="{name: '*'}"
             defaultCellWidth='"auto"'
diff --git a/Open-ILS/src/templates/acq/funding_source/view.tt2 b/Open-ILS/src/templates/acq/funding_source/view.tt2
index 6ab579480d..4315b6bb07 100644
--- a/Open-ILS/src/templates/acq/funding_source/view.tt2
+++ b/Open-ILS/src/templates/acq/funding_source/view.tt2
@@ -8,33 +8,33 @@
 <div class='oils-acq-actions-div' style='margin:8px;'> <!-- XXX CSS -->
 
     <!-- Dropdown menu for creating a new funding source credit -->
-    <div dojoType="dijit.form.DropDownButton">
+    <div data-dojo-type="dijit.form.DropDownButton">
         <span>Apply Credit</span>
-        <div dojoType="dijit.TooltipDialog" execute="applyFSCredit(arguments[0]);">
+        <div data-dojo-type="dijit.TooltipDialog" execute="applyFSCredit(arguments[0]);">
             <table class='dijitTooltipTable'>
                 <tr>
                     <td><label for="amount">Amount: </label></td>
                     <td>
-                        <input dojoType="dijit.form.CurrencyTextBox" name="amount"> </input>
+                        <input data-dojo-type="dijit.form.CurrencyTextBox" name="amount"> </input>
                     </td>
                 </tr>
                 <tr>
                     <td><label for="note">Note: </label></td>
                     <td>
-                        <input dojoType="dijit.form.TextBox" name="note"> </input>
+                        <input data-dojo-type="dijit.form.TextBox" name="note"> </input>
                     </td>
                 </tr>
                 <tr>
                     <td colspan='2' align='center'>
-                        <button dojoType=dijit.form.Button type="submit">Apply</button>
+                        <button data-dojo-type=dijit.form.Button type="submit">Apply</button>
                     </td>
                 </tr>
             </table>
         </div>
     </div> 
-    <div dojoType="dijit.form.DropDownButton">
+    <div data-dojo-type="dijit.form.DropDownButton">
         <span>Allocate to Fund</span>
-        <div dojoType="dijit.TooltipDialog" execute="applyFSAllocation(arguments[0]);">
+        <div data-dojo-type="dijit.TooltipDialog" execute="applyFSAllocation(arguments[0]);">
             <script type='dojo/connect' event='onOpen'>
                 openils.acq.Fund.createStore(
                     function(store) {
@@ -48,15 +48,15 @@
                 <tr>
                     <td><label for="amount">Fund: </label></td>
                     <td>
-                        <input jsId='fundingSourceFundSelector' name="fund" 
-                            dojoType="dijit.form.FilteringSelect" searchAttr='code' labelAttr='code'>
+                        <input data-dojo-id='fundingSourceFundSelector' name="fund" 
+                            data-dojo-type="dijit.form.FilteringSelect" searchAttr='code' labelAttr='code'>
                         </input>
                     </td>
                 </tr>
                 <tr>
                     <td><label for="amount">Amount: </label></td>
                     <td>
-                        <input dojoType="dijit.form.CurrencyTextBox" name="amount"> </input>
+                        <input data-dojo-type="dijit.form.CurrencyTextBox" name="amount"> </input>
                     </td>
                 </tr>
                 <!-- Percent-based allocations are not supported.  Will implement or remove later.
@@ -64,7 +64,7 @@
                     <td><label for="amount">Percent: </label></td>
                     <td>
                         <input 
-                            dojoType="dijit.form.NumberTextBox" 
+                            data-dojo-type="dijit.form.NumberTextBox" 
                             constraints="{min:0,max:100}" 
                             promptMessage="Please enter an amount between 0 and 100"
                             name="percent"> 
@@ -75,12 +75,12 @@
                 <tr>
                     <td><label for="note">Note: </label></td>
                     <td>
-                        <input dojoType="dijit.form.TextBox" name="note"> </input>
+                        <input data-dojo-type="dijit.form.TextBox" name="note"> </input>
                     </td>
                 </tr>
                 <tr>
                     <td colspan='2' align='center'>
-                        <button dojoType=dijit.form.Button type="submit">Apply</button>
+                        <button data-dojo-type=dijit.form.Button type="submit">Apply</button>
                     </td>
                 </tr>
             </table>
@@ -88,15 +88,15 @@
     </div> 
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top">
-    <div dojoType="dijit.layout.TabContainer">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top">
+    <div data-dojo-type="dijit.layout.TabContainer">
 
-        <div dojoType="dijit.layout.ContentPane" class='oils-acq-detail-content-pane' title="Summary" selected='true'>
+        <div data-dojo-type="dijit.layout.ContentPane" class='oils-acq-detail-content-pane' title="Summary" selected='true'>
             <script type='dojo/connect' event='onShow'>loadFSGrid();</script>
 
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top"> 
-                <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:600px;'> 
-                    <table jsId="fundingSourceGrid" dojoType="dojox.grid.DataGrid" query="{id: '*'}" rowSelector='20px'> 
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top"> 
+                <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:600px;'> 
+                    <table data-dojo-id="fundingSourceGrid" data-dojo-type="dojox.grid.DataGrid" query="{id: '*'}" rowSelector='20px'> 
                         <thead> 
                             <tr> 
                                 <th field="id">ID</th> 
@@ -114,16 +114,16 @@
             </div>               
         </div>
  
-        <div dojoType="dijit.layout.ContentPane" class='oils-acq-detail-content-pane' title="Credits">
+        <div data-dojo-type="dijit.layout.ContentPane" class='oils-acq-detail-content-pane' title="Credits">
             <script type='dojo/connect' event='onShow'>loadCreditGrid(); </script> 
 
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top"> 
-                <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top"> 
+                <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
 
                     <table 
-                        jsId="fsCreditGrid"
+                        data-dojo-id="fsCreditGrid"
                         autoheight="true"
-                        dojoType="openils.widget.AutoGrid"
+                        data-dojo-type="openils.widget.AutoGrid"
                         fieldOrder="['amount', 'effective_date', 'deadline_date', 'note']"
                         suppressFields="['id', 'funding_source']"
                         defaultCellWidth='"auto"'
@@ -136,16 +136,16 @@
         </div>
 
         <!-- Fund Allocations -->
-        <div dojoType="dijit.layout.ContentPane" class='oils-acq-detail-content-pane' title="Allocations">
+        <div data-dojo-type="dijit.layout.ContentPane" class='oils-acq-detail-content-pane' title="Allocations">
             <script type='dojo/connect' event='onShow'>loadAllocationGrid();</script>
             
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top"> 
-                <div dojoType="dijit.layout.ContentPane" layoutAlign="client"> 
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top"> 
+                <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client"> 
 
                     <table 
-                        jsId="fsAllocationGrid" 
+                        data-dojo-id="fsAllocationGrid" 
                         autoHeight='true'
-                        dojoType="openils.widget.AutoGrid"
+                        data-dojo-type="openils.widget.AutoGrid"
                         fieldOrder="['fund', 'amount', 'create_time', 'allocator', 'note']"
                         suppressFields="['id', 'funding_source']"
                         defaultCellWidth='"auto"'
diff --git a/Open-ILS/src/templates/acq/invoice/receive.tt2 b/Open-ILS/src/templates/acq/invoice/receive.tt2
index f728a7b799..f8dc229078 100644
--- a/Open-ILS/src/templates/acq/invoice/receive.tt2
+++ b/Open-ILS/src/templates/acq/invoice/receive.tt2
@@ -63,7 +63,7 @@
         <button onclick="copy_table.back_to_invoice();">Return to Invoice</button>
     </p>
     <div class="hidden">
-        <div dojoType="openils.widget.ProgressDialog" jsId="progress_dialog"></div>
+        <div data-dojo-type="openils.widget.ProgressDialog" data-dojo-id="progress_dialog"></div>
     </div>
 </div>
 [% END %]
diff --git a/Open-ILS/src/templates/acq/invoice/view.tt2 b/Open-ILS/src/templates/acq/invoice/view.tt2
index 7e4d48931b..6d3e336864 100644
--- a/Open-ILS/src/templates/acq/invoice/view.tt2
+++ b/Open-ILS/src/templates/acq/invoice/view.tt2
@@ -1,18 +1,18 @@
 [% WRAPPER 'base.tt2' %]
 [% ctx.page_title = 'Invoicing' %]
 <script type="text/javascript">var invoiceId = '[% ctx.page_args.0 %]';</script>
-<div dojoType="dijit.layout.ContentPane" style="height:100%">
+<div data-dojo-type="dijit.layout.ContentPane" style="height:100%">
 
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
         <div> Invoice </div>
         <div id="acq-view-invoice-receive" class="hidden"><button id="acq-view-invoice-receive-link">Receive Items</button></div>
     </div>
 
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
         <div id='acq-view-invoice-div'></div>
     </div>
 
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
         <table class='oils-acq-invoice-table'>
             <thead/>
             <tbody id='acq-invoice-entry-header' class='hidden'>
@@ -99,37 +99,37 @@
             <tbody>
                 <tr>
                     <td colspan='3' style='text-align:right;'>
-                        <button jsId='invoiceSaveButton' class='hide-complete'
-                            dojoType='dijit.form.Button' onclick='saveChanges();'>Save</button>
-                        <button jsId='invoiceProrateButton' class='hide-complete'
-                            dojoType='dijit.form.Button' onclick='saveChanges(true);'>Save &amp; Prorate</button>
-                        <button jsId='invoiceCloseButton' class='hide-complete'
-                            dojoType='dijit.form.Button' onclick='saveChanges(false, true);'>Save &amp; Close</button>
+                        <button data-dojo-id='invoiceSaveButton' class='hide-complete'
+                            data-dojo-type='dijit.form.Button' onclick='saveChanges();'>Save</button>
+                        <button data-dojo-id='invoiceProrateButton' class='hide-complete'
+                            data-dojo-type='dijit.form.Button' onclick='saveChanges(true);'>Save &amp; Prorate</button>
+                        <button data-dojo-id='invoiceCloseButton' class='hide-complete'
+                            data-dojo-type='dijit.form.Button' onclick='saveChanges(false, true);'>Save &amp; Close</button>
                         <span class='hidden' id='acq-invoice-reopen-button-wrapper'>
-                            <button jsId='invoiceReopenButton' 
-                                dojoType='dijit.form.Button' onclick='saveChanges(false, false, true);'>Reopen Invoice</button>
+                            <button data-dojo-id='invoiceReopenButton' 
+                                data-dojo-type='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;'></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>
+                    <td class='acq-invoice-center-col'><div data-dojo-id='totalInvoicedBox' data-dojo-type='dijit.form.CurrencyTextBox' style='width:9em;'></div></td>
+                    <td class='acq-invoice-paid-col'><div data-dojo-id='totalPaidBox' data-dojo-type='dijit.form.CurrencyTextBox' style='width:9em;'></div></td>
+                    <td class='acq-invoice-center-col'><div data-dojo-id='balanceOwedBox' data-dojo-type='dijit.form.CurrencyTextBox' style='width:9em;'></div></td>
                 </tr>
             </tbody>
         </table>
     </div>
 </div>
-<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 data-dojo-type='openils.widget.ProgressDialog' data-dojo-id='progressDialog'></div>
+<div data-dojo-id='extraItemsDialog' data-dojo-type="dijit.Dialog" title="Extra Items">
+    <div data-dojo-type="dijit.layout.ContentPane" style='text-align:center;'>
         <div id='acq-invoice-extra-copies-message'></div>
         <br/>
         Select a fund for the new items: <div id='acq-invoice-extra-copies-fund'></div>
         <br/><br/>
         <br/><br/>
         <span style='padding-right: 10px;'>
-            <button dojoType='dijit.form.Button' jsId='extraCopiesCancel'>Cancel</button>
+            <button data-dojo-type='dijit.form.Button' data-dojo-id='extraCopiesCancel'>Cancel</button>
         </span>
-        <button dojoType='dijit.form.Button' jsId='extraCopiesGo'>Add New Items</button>
+        <button data-dojo-type='dijit.form.Button' data-dojo-id='extraCopiesGo'>Add New Items</button>
     </div>
 </div>
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/invoice/common.js'> </script>
diff --git a/Open-ILS/src/templates/acq/lineitem/findbib.tt2 b/Open-ILS/src/templates/acq/lineitem/findbib.tt2
index 57c1142166..5054bd9b25 100644
--- a/Open-ILS/src/templates/acq/lineitem/findbib.tt2
+++ b/Open-ILS/src/templates/acq/lineitem/findbib.tt2
@@ -10,8 +10,8 @@
 </script>
 
 <div id='acq-findbib-search' style='margin:30px; border:1px solid #333; text-align:center;'>
-    <input dojoType='dijit.form.TextBox' jsId='searchQuery' style='width:500px;'></input>
-    <button dojoType='dijit.form.Button' onclick='doSearch'>Search</button>
+    <input data-dojo-type='dijit.form.TextBox' data-dojo-id='searchQuery' style='width:500px;'></input>
+    <button data-dojo-type='dijit.form.Button' onclick='doSearch'>Search</button>
 </div>
 
 <div style='width:100%; ' id='acq-findbib-container'>
@@ -62,12 +62,12 @@
 </style>
 
 <div id='marc-div' class='hidden'>
-    <button dojoType='dijit.form.Button' onclick='openils.Util.hide("marc-div");'>Hide</button>
+    <button data-dojo-type='dijit.form.Button' onclick='openils.Util.hide("marc-div");'>Hide</button>
     <div style='text-align:left;'>
         <div id='marc-html-div'></div>
     </div>
 </div>
-<div jsId='progressDialog' dojoType='openils.widget.ProgressDialog' message='Searching....'></div>
+<div data-dojo-id='progressDialog' data-dojo-type='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/history.tt2 b/Open-ILS/src/templates/acq/lineitem/history.tt2
index d4743a776f..3a67093cd5 100644
--- a/Open-ILS/src/templates/acq/lineitem/history.tt2
+++ b/Open-ILS/src/templates/acq/lineitem/history.tt2
@@ -2,10 +2,10 @@
 [% ctx.page_title = "Lineitem History" %]
 <h1>Lineitem History</h1>
 <br/>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="lhGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="lhGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             defaultCellWidth="'auto'"
             fieldOrder="['audit_time', 'state', 'picklist', 'purchase_order', 'provider', 'estimated_unit_price', 'claim_policy', 'create_time', 'edit_time', 'creator', 'editor', 'selector']"
             query="{audit_id: '*'}"
diff --git a/Open-ILS/src/templates/acq/lineitem/related.tt2 b/Open-ILS/src/templates/acq/lineitem/related.tt2
index 43a82d43c6..0994167377 100644
--- a/Open-ILS/src/templates/acq/lineitem/related.tt2
+++ b/Open-ILS/src/templates/acq/lineitem/related.tt2
@@ -37,27 +37,27 @@
     </ul>
 
     <div id="acq-related-li-create-holder">
-        <button jsId="addToPlButton" dojoType="dijit.form.Button">
+        <button data-dojo-id="addToPlButton" data-dojo-type="dijit.form.Button">
             Add to Selection List
         </button>
-        <button jsId="addToPoButton" dojoType="dijit.form.Button">
+        <button data-dojo-id="addToPoButton" data-dojo-type="dijit.form.Button">
             Add to Purchase Order
         </button>
-        <button jsId="createPoButton" dojoType="dijit.form.Button">
+        <button data-dojo-id="createPoButton" data-dojo-type="dijit.form.Button">
             Create Purchase Order
         </button>
     </div>
 
     <div class="hidden">
-        <div dojoType="dijit.Dialog" jsId='addToPoDialog'>
+        <div data-dojo-type="dijit.Dialog" data-dojo-id='addToPoDialog'>
             <table class='dijitTooltipTable'>
                 <tr>
                     <td><label>Enter the PO #: </label></td>
-                    <td><input jsId='addToPoInput' dojoType="dijit.form.TextBox" /></td>
+                    <td><input data-dojo-id='addToPoInput' data-dojo-type="dijit.form.TextBox" /></td>
                 </tr>
                 <tr>
                     <td colspan='2' align='center'>
-                        <button dojoType='dijit.form.Button' jsId='addToPoSave' type="submit">Save</button>
+                        <button data-dojo-type='dijit.form.Button' data-dojo-id='addToPoSave' type="submit">Save</button>
                     </td>
                 </tr>
             </table>
diff --git a/Open-ILS/src/templates/acq/lineitem/search.tt2 b/Open-ILS/src/templates/acq/lineitem/search.tt2
index 730f91022d..5d1d76404b 100644
--- a/Open-ILS/src/templates/acq/lineitem/search.tt2
+++ b/Open-ILS/src/templates/acq/lineitem/search.tt2
@@ -3,8 +3,8 @@
 <!-- later: "[% ctx.page_args.0 %]" -->
 <div id="oils-acq-li-search-form-holder" class="hidden">
     <h1 class="oils-acq-li-search">Lineitem Search</h1>
-    <form dojoType="dijit.form.Form" action="" method=""
-        id="oils-acq-li-search-form" jsId="searchForm">
+    <form data-dojo-type="dijit.form.Form" action="" method=""
+        id="oils-acq-li-search-form" data-dojo-id="searchForm">
         <script type="dojo/method" event="onSubmit">
             doSearch(this.getValues());
             return false; /* no redirect */
@@ -15,8 +15,8 @@
                 Lineitem state
             </label>
             <input class="oils-acq-li-search" name="state"
-                dojoType="dijit.form.FilteringSelect" required="false"
-                id="state_selector" jsId="stateSelector"
+                data-dojo-type="dijit.form.FilteringSelect" required="false"
+                id="state_selector" data-dojo-id="stateSelector"
                 labelAttr="description" searchAttr="description"
                 />
             <label class="oils-acq-li-search" for="agency_selector">
@@ -25,8 +25,8 @@
             <input class="oils-acq-li-search" id="agency_selector" />
         </div>
         <div class="oils-acq-li-search-form-row">
-            <input class="oils-acq-li-search" dojoType="dijit.form.RadioButton"
-                name="attr_search_type" jsId="attrSearchTypeNone"
+            <input class="oils-acq-li-search" data-dojo-type="dijit.form.RadioButton"
+                name="attr_search_type" data-dojo-id="attrSearchTypeNone"
                 id="attr_search_type_none" value="none" checked="checked"
                 onChange="toggleAttrSearchType(this.value, this.checked);" />
             <label for="attr_search_type_none" class="oils-acq-li-search">
@@ -36,8 +36,8 @@
         <div class="oils-acq-li-search-form-row">
             <!-- the "style" attribute on this input seems to be necessary as
                 I can't get the same effect from CSS for some reason -->
-            <input class="oils-acq-li-search" dojoType="dijit.form.RadioButton"
-                name="attr_search_type" jsId="attrSearchTypeScalar"
+            <input class="oils-acq-li-search" data-dojo-type="dijit.form.RadioButton"
+                name="attr_search_type" data-dojo-id="attrSearchTypeScalar"
                 id="attr_search_type_scalar" value="scalar"
                 style="vertical-align: top;"
                 onChange="toggleAttrSearchType(this.value, this.checked);" />
@@ -47,14 +47,14 @@
             <div id="oils-acq-li-search-attr-scalar" class="hidden">
 <!--            <div class="oils-acq-li-search-conjunction">
                     <em>Show results for which:</em><br />
-                    <input dojoType="dijit.form.RadioButton"
+                    <input data-dojo-type="dijit.form.RadioButton"
                         id="scalar_search_conjuction_or"
                         name="scalar_search_conjunction" value="or"
                         checked="checked" class="oils-acq-li-search" />
                     <label for="scalar_search_conjuction_or"
                         class="oils-acq-li-search">ANY of the following terms match</label>
                     <br />
-                    <input dojoType="dijit.form.RadioButton"
+                    <input data-dojo-type="dijit.form.RadioButton"
                         id="scalar_search_conjuction_and"
                         name="scalar_search_conjunction" value="and"
                         class="oils-acq-li-search" />
@@ -69,12 +69,12 @@
                         href="javascript:void(0);" />(X)</a>
                 </div>
                 <div id="oils-acq-li-search-scalar-adder">
-                    <span dojoType="dijit.form.Button"
+                    <span data-dojo-type="dijit.form.Button"
                         class="oils-acq-li-search"
                         onclick="scalarAttrSearchManager.add();">
                         Add more search terms
                     </span>
-                    <span dojoType="dijit.form.Button"
+                    <span data-dojo-type="dijit.form.Button"
                         class="oils-acq-li-search"
                         onclick="scalarAttrSearchManager.newBrief();">
                         New brief record like this
@@ -83,8 +83,8 @@
             </div>
         </div>
         <div class="oils-acq-li-search-form-row">
-            <input class="oils-acq-li-search" dojoType="dijit.form.RadioButton"
-                name="attr_search_type" jsId="attrSearchTypeArray"
+            <input class="oils-acq-li-search" data-dojo-type="dijit.form.RadioButton"
+                name="attr_search_type" data-dojo-id="attrSearchTypeArray"
                 id="attr_search_type_array" value="array"
                 onChange="toggleAttrSearchType(this.value, this.checked);" />
             <label for="attr_search_type_array" class="oils-acq-li-search">
@@ -92,21 +92,21 @@
             </label>
             <div id="oils-acq-li-search-attr-array" class="hidden">
                 <input class="oils-acq-li-search"
-                    name="array_def" dojoType="dijit.form.FilteringSelect"
-                    jsId="attrArrayDefSelector"
+                    name="array_def" data-dojo-type="dijit.form.FilteringSelect"
+                    data-dojo-id="attrArrayDefSelector"
                     labelAttr="description" searchAttr="description" />
                 <span class="oils-acq-li-search">
                     <span id="records-up">0</span> term(s) prepared for search
                 </span>
-                <span class="oils-acq-li-search" dojoType="dijit.form.Button"
+                <span class="oils-acq-li-search" data-dojo-type="dijit.form.Button"
                     onClick="loadTermsFromFile();">Add file</span>
-                <span class="oils-acq-li-search" dojoType="dijit.form.Button"
+                <span class="oils-acq-li-search" data-dojo-type="dijit.form.Button"
                     onClick="clearTerms();">Clear loaded search terms</span>
             </div>
         </div>
         <div class="oils-acq-li-search-form-row"
             id="oils-acq-li-search-attr-submit">
-            <span dojoType="dijit.form.Button" type="submit">Search</span>
+            <span data-dojo-type="dijit.form.Button" type="submit">Search</span>
         </div>
     </form>
 </div>
diff --git a/Open-ILS/src/templates/acq/lineitem/worksheet.tt2 b/Open-ILS/src/templates/acq/lineitem/worksheet.tt2
index 262c2700a8..eb1a0d2d17 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>
+    <div data-dojo-id='progressDialog' data-dojo-type='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/bib_search.tt2 b/Open-ILS/src/templates/acq/picklist/bib_search.tt2
index dd7e83cc2e..3f39b893bf 100644
--- a/Open-ILS/src/templates/acq/picklist/bib_search.tt2
+++ b/Open-ILS/src/templates/acq/picklist/bib_search.tt2
@@ -9,7 +9,7 @@
 
 <div id='oils-acq-search-block' class='container'>
 
-    <form dojoType='dijit.form.Form' action='' method=''>
+    <form data-dojo-type='dijit.form.Form' action='' method=''>
         <script type="dojo/method" event="onSubmit">
             doSearch(this.getValues());
             return false; /* don't redirect */
@@ -17,7 +17,7 @@
         <div id='oils-acq-search-sources-block'>
             <div id='oils-acq-search-sources-label'>Search Sources</div>
             <select style='overflow-y:auto;' id='oils-acq-search-source-select' 
-                    multiple='true' jsId="bibSourceSelect" dojoType="dojox.form.CheckedMultiSelect">
+                    multiple='true' data-dojo-id="bibSourceSelect" data-dojo-type="dojox.form.CheckedMultiSelect">
                 <option selected='selected' value='native-evergreen-catalog'>Evergreen Catalog</option>
             </select>
         </div>
@@ -34,14 +34,14 @@
                     <tr id='oils-acq-seach-fields-count-row'>
                         <td name='label'>Hits Per Source</td>
                         <td><input name='limit'
-                            dojoType='dijit.form.NumberSpinner'
+                            data-dojo-type='dijit.form.NumberSpinner'
                             constraints='{min:5,max:50}'
                             value='10'></input>
                         </td>
                     </tr>
                     <tr id='oils-acq-search-fields-submit-block'>
-                        <td><div dojoType='dijit.form.Button' type='submit'>Submit</div></td>
-                        <td><div dojoType='dijit.form.Button' onclick='clearSearchForm()'>Clear Form</div></td>
+                        <td><div data-dojo-type='dijit.form.Button' type='submit'>Submit</div></td>
+                        <td><div data-dojo-type='dijit.form.Button' onclick='clearSearchForm()'>Clear Form</div></td>
                     </tr>
                 </tbody>
             </table>
@@ -50,16 +50,16 @@
 </div>
 
 <div id='oils-acq-pl-search-results'>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Search Results</div>
         <div>
             <div id='oils-acq-update-li-progress' class='hidden'>
-                <div dojoType="dijit.ProgressBar" style="width:300px" jsId="liUpdateProgress"></div>
+                <div data-dojo-type="dijit.ProgressBar" style="width:300px" data-dojo-id="liUpdateProgress"></div>
             </div>
-            <div dojoType='dijit.form.Button' onClick='showDiv("oils-acq-search-block");'>New Search</div>
+            <div data-dojo-type='dijit.form.Button' onClick='showDiv("oils-acq-search-block");'>New Search</div>
         </div>
     </div>
-    <div dojoType='dijit.layout.ContentPane' layoutAlign='client'>
+    <div data-dojo-type='dijit.layout.ContentPane' layoutAlign='client'>
         [% INCLUDE 'acq/common/li_table.tt2' %]
     </div>
 </div>
diff --git a/Open-ILS/src/templates/acq/picklist/brief_record.tt2 b/Open-ILS/src/templates/acq/picklist/brief_record.tt2
index 0a126da44c..9b90a79171 100644
--- a/Open-ILS/src/templates/acq/picklist/brief_record.tt2
+++ b/Open-ILS/src/templates/acq/picklist/brief_record.tt2
@@ -1,6 +1,6 @@
 [% WRAPPER 'base.tt2' %]
 <h1>New Brief Record</h1><br/>
-<form dojoType='dijit.form.Form'>
+<form data-dojo-type='dijit.form.Form'>
     <script type='dojo/method' event='onSubmit'>
         return saveBriefRecord(this.getValues());
     </script>
@@ -8,11 +8,11 @@
         <tbody id='acq-brief-record-tbody'>
             <tr id='acq-brief-record-pl-row'>
                 <td>Add To Selection List</td>
-                <td><select dojoType='dijit.form.ComboBox' jsId='plSelector'/></td>
+                <td><select data-dojo-type='dijit.form.ComboBox' data-dojo-id='plSelector'/></td>
             </tr>
             <tr id='acq-brief-record-po-row'>
                 <td>Adding to Purchase Order</td>
-                <td><input dojoType='dijit.form.TextBox' jsId='poNumber' disabled='disabled'/></td>
+                <td><input data-dojo-type='dijit.form.TextBox' data-dojo-id='poNumber' disabled='disabled'/></td>
             </tr>
             <tr id='acq-brief-record-row'>
                 <td><div name='name'></div></td>
@@ -21,9 +21,9 @@
         </tbody>
         <tbody>
             <tr>
-                <td><button dojoType='dijit.form.Button' type='submit'>Save Record</button></td>
+                <td><button data-dojo-type='dijit.form.Button' type='submit'>Save Record</button></td>
                 <!--
-                <td><button dojoType='dijit.form.Button' type='submit' jsId='marcEditButton'>Edit MARC</button></td>
+                <td><button data-dojo-type='dijit.form.Button' type='submit' data-dojo-id='marcEditButton'>Edit MARC</button></td>
                 -->
             </tr>
         </tbody>
diff --git a/Open-ILS/src/templates/acq/picklist/list.tt2 b/Open-ILS/src/templates/acq/picklist/list.tt2
index 250e2c277a..06599e98ff 100644
--- a/Open-ILS/src/templates/acq/picklist/list.tt2
+++ b/Open-ILS/src/templates/acq/picklist/list.tt2
@@ -1,7 +1,7 @@
 [% WRAPPER 'base.tt2' %]
 [% ctx.page_title = 'Selection Lists' %]
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <div id='oils-acq-list-header' class='container'>
         <div id='oils-acq-picklist-my-list-header'>
             <div id='oils-acq-list-header-label'>My Selection Lists</div>
@@ -9,66 +9,66 @@
     </div>
 </div>
 
-<div class='oils-acq-actions-div' dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div class='oils-acq-actions-div' data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
 
-    <div dojoType="dijit.form.DropDownButton">
+    <div data-dojo-type="dijit.form.DropDownButton">
         <span>New Selection List</span>
-        <div dojoType="dijit.TooltipDialog" execute="createPL(arguments[0]);">
+        <div data-dojo-type="dijit.TooltipDialog" execute="createPL(arguments[0]);">
             <table class='dijitTooltipTable'>
                 <tr>
                     <td><label for="name">Name:</label></td>
-                    <td><input dojoType="dijit.form.TextBox" name="name"/></td>
+                    <td><input data-dojo-type="dijit.form.TextBox" name="name"/></td>
                 </tr>
                 <tr>
                     <td colspan='2' align='center'>
-                        <button dojoType='dijit.form.Button' type="submit">Create</button>
+                        <button data-dojo-type='dijit.form.Button' type="submit">Create</button>
                     </td>
                 </tr>
             </table>
         </div>
     </div>
 
-    <div dojoType="dijit.form.DropDownButton">
+    <div data-dojo-type="dijit.form.DropDownButton">
         <span>Clone Selected</span>
-        <div dojoType="dijit.TooltipDialog" execute="cloneSelectedPl(arguments[0]);">
+        <div data-dojo-type="dijit.TooltipDialog" execute="cloneSelectedPl(arguments[0]);">
             <table class='dijitTooltipTable'>
                 <tr>
                     <td><label for="name">New Name:</label></td>
-                    <td><input dojoType="dijit.form.TextBox" name="name"/></td>
+                    <td><input data-dojo-type="dijit.form.TextBox" name="name"/></td>
                 </tr>
                 <tr>
                     <td colspan='2' align='center'>
-                        <button dojoType='dijit.form.Button' type="submit">Clone</button>
+                        <button data-dojo-type='dijit.form.Button' type="submit">Clone</button>
                     </td>
                 </tr>
             </table>
         </div>
     </div>
 
-    <div dojoType="dijit.form.DropDownButton">
+    <div data-dojo-type="dijit.form.DropDownButton">
         <span>Merge Selected</span>
-        <div dojoType="dijit.TooltipDialog" execute="mergeSelectedPl(arguments[0]);" jsId='plMergeDialog'>
+        <div data-dojo-type="dijit.TooltipDialog" execute="mergeSelectedPl(arguments[0]);" data-dojo-id='plMergeDialog'>
             <table class='dijitTooltipTable'>
                 <tr>
                     <td><label for="name">Choose the Lead Selection List:</label></td>
-                    <td><input jsId='plMergeLeadSelector' dojoType="dijit.form.FilteringSelect" name="lead"/></td>
+                    <td><input data-dojo-id='plMergeLeadSelector' data-dojo-type="dijit.form.FilteringSelect" name="lead"/></td>
                 </tr>
                 <tr>
                     <td colspan='2' align='center'>
-                        <button dojoType='dijit.form.Button' type="submit">Merge</button>
+                        <button data-dojo-type='dijit.form.Button' type="submit">Merge</button>
                     </td>
                 </tr>
             </table>
         </div>
     </div>
-    <button dojoType="dijit.form.Button" onclick="deleteFromGrid();">Delete Selected</button>
+    <button data-dojo-type="dijit.form.Button" onclick="deleteFromGrid();">Delete Selected</button>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <table 
             autoHeight='true'
-            jsId="plListGrid" 
-            dojoType="openils.widget.AutoGrid" 
+            data-dojo-id="plListGrid" 
+            data-dojo-type="openils.widget.AutoGrid" 
             query="{id: '*'}" 
             fieldOrder="['name', 'owner', 'entry_count', 'create_time', 'edit_time']"
             suppressFields="['editor', 'creator']"
@@ -86,7 +86,7 @@
         </thead>
     </table>
     <div class='hidden'>
-        <div jsId='progressDialog' dojoType='openils.widget.ProgressDialog'></div>
+        <div data-dojo-id='progressDialog' data-dojo-type='openils.widget.ProgressDialog'></div>
     </div>
 </div>
 
diff --git a/Open-ILS/src/templates/acq/picklist/upload.tt2 b/Open-ILS/src/templates/acq/picklist/upload.tt2
index 6d04d7f9a0..2309afe3b6 100644
--- a/Open-ILS/src/templates/acq/picklist/upload.tt2
+++ b/Open-ILS/src/templates/acq/picklist/upload.tt2
@@ -9,13 +9,13 @@
             <tr>
                 <td>Create Purchase Order</td>
                 <td>
-                    <input dojoType='dijit.form.CheckBox' jsId='acqPlUploadCreatePo'></input>
+                    <input data-dojo-type='dijit.form.CheckBox' data-dojo-id='acqPlUploadCreatePo'></input>
                 </td>
             </tr>
             <tr>
                 <td>Activate Purchase Order</td>
                 <td>
-                    <input dojoType='dijit.form.CheckBox' jsId='acqPlUploadActivatePo'></input>
+                    <input data-dojo-type='dijit.form.CheckBox' data-dojo-id='acqPlUploadActivatePo'></input>
                 </td>
             </tr>
             <tr>
@@ -29,7 +29,7 @@
             <tr id='acq-pl-upload-picklist'>
                 <td>Add to Selection List</td>
                 <td>
-                    <select jsId='acqPlUploadPlSelector' dojoType='dijit.form.ComboBox'></select>
+                    <select data-dojo-id='acqPlUploadPlSelector' data-dojo-type='dijit.form.ComboBox'></select>
                 </td>
             </tr>
 
@@ -41,7 +41,7 @@
                 <td colspan='5'>
                     <span id="vl-file-label">[% l('File to Upload:') %]</span>
                     <input size='48' style='border:1px solid #888;' type="file" name="marc_upload"/>
-                    <span style='margin-left:10px;'><button dojoType="dijit.form.Button" onclick="acqUploadRecords()">[% l('Upload') %]</button></span>
+                    <span style='margin-left:10px;'><button data-dojo-type="dijit.form.Button" onclick="acqUploadRecords()">[% l('Upload') %]</button></span>
                 </td>
             </tr>
 
@@ -52,7 +52,7 @@
     <br/>
     <div id="acq-pl-upload-progress" class='hidden'>
         <div id='acq-pl-upload-progress-bar'>
-            <div dojoType="dijit.ProgressBar" style="width:300px" indeterminate="true"></div>
+            <div data-dojo-type="dijit.ProgressBar" style="width:300px" indeterminate="true"></div>
         </div>
         [% PROCESS vlagent_results %]
         <div id='acq-pl-upload-complete' class='hidden'>
diff --git a/Open-ILS/src/templates/acq/picklist/user_request.tt2 b/Open-ILS/src/templates/acq/picklist/user_request.tt2
index 9518f3c456..5d22fc6a2a 100644
--- a/Open-ILS/src/templates/acq/picklist/user_request.tt2
+++ b/Open-ILS/src/templates/acq/picklist/user_request.tt2
@@ -2,18 +2,18 @@
 [% ctx.page_title = 'Patron Requests' %]
 <script type="text/javascript">var reqId = '[% ctx.page_args.0 %]';</script>
 
-    <div dojoType="dijit.layout.StackContainer" id="stackContainer" doLayout="false">
+    <div data-dojo-type="dijit.layout.StackContainer" id="stackContainer" doLayout="false">
         <!-- *** List View ********************************************************************************* -->
-        <div dojoType="dijit.layout.ContentPane">
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+        <div data-dojo-type="dijit.layout.ContentPane">
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
                 <div>[% ctx.page_title %]</div>
             </div>
             <div style="width: 100%">
                 <span>
                     <span>Context Org Unit</span>
                     <select 
-                        dojoType="openils.widget.OrgUnitFilteringSelect" 
-                        jsId='contextOrgSelector'
+                        data-dojo-type="openils.widget.OrgUnitFilteringSelect" 
+                        data-dojo-id='contextOrgSelector'
                         searchAttr='shortname' 
                         labelAttr='shortname'> 
                     </select>
@@ -22,8 +22,8 @@
                     <a name="user" href="javascript:changeUserPrompt();">User</a>
                     <span
                         name="user"
-                        jsId="contextUsrTextbox"
-                        dojoType="dijit.form.TextBox"
+                        data-dojo-id="contextUsrTextbox"
+                        data-dojo-type="dijit.form.TextBox"
                         disabled="true">
                     </span>
                 </span>
@@ -31,15 +31,15 @@
                     <a name="lineitem" href="javascript:changeLIPrompt();">PO Line Item</a>
                     <span
                         name="lineitem"
-                        jsId="contextLITextbox"
-                        dojoType="dijit.form.TextBox"
+                        data-dojo-id="contextLITextbox"
+                        data-dojo-type="dijit.form.TextBox"
                         disabled="true">
                     </span>
                 </span>
-                <button dojoType="dijit.form.Button" onClick="createRequest()">Create Request</button>
+                <button data-dojo-type="dijit.form.Button" onClick="createRequest()">Create Request</button>
             </div>
-            <table  jsId="rGrid"
-                    dojoType="openils.widget.AutoGrid"
+            <table  data-dojo-id="rGrid"
+                    data-dojo-type="openils.widget.AutoGrid"
                     query="{id: '*'}"
                     suppressFields='["id", "usr", "pickup_lib", "holdable_formats", "phone_notify", "email_notify", "lineitem", "eg_bib", "max_fee", "cancel_reason"]'
                     fieldOrder='["title", "author", "isxn", "article_title", "article_pages", "request_type", "volume", "pubdate", "publisher", "location", "other_info", "mentioned"]'
@@ -60,22 +60,22 @@
             </table>
         </div>
         <!-- *** Detail View ********************************************************************************* -->
-        <div dojoType="dijit.layout.ContentPane" style="height: 100%;">
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+        <div data-dojo-type="dijit.layout.ContentPane" style="height: 100%;">
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
                 <div>Patron Request</div>
                 <div>
-                    <button dojoType="dijit.form.Button" onClick="location.href=oilsBasePath+'/acq/picklist/user_request'">[% ctx.page_title %]</button>
-                    <button dojoType="dijit.form.Button" onClick="fooPicklist()"><span id="add_to_picklist">Add to Selection List</span><span id="view_picklist">View Selection List</span></button>
-                    <button dojoType="dijit.form.Button" onClick="setNoHold()">Set No Hold</button>
-                    <span dojoType="dijit.form.DropDownButton">
+                    <button data-dojo-type="dijit.form.Button" onClick="location.href=oilsBasePath+'/acq/picklist/user_request'">[% ctx.page_title %]</button>
+                    <button data-dojo-type="dijit.form.Button" onClick="fooPicklist()"><span id="add_to_picklist">Add to Selection List</span><span id="view_picklist">View Selection List</span></button>
+                    <button data-dojo-type="dijit.form.Button" onClick="setNoHold()">Set No Hold</button>
+                    <span data-dojo-type="dijit.form.DropDownButton">
                         <span>Cancel Request</span>
-                        <span dojoType="dijit.TooltipDialog">
+                        <span data-dojo-type="dijit.TooltipDialog">
                             <label for="acq-ur-cancel-reason">
                                 Reason:
                             </label>
                             <span id="acq-ur-cancel-reason"></span>
-                            <button jsId="acqUrCancelReasonSubmit"
-                                dojoType="dijit.form.Button"
+                            <button data-dojo-id="acqUrCancelReasonSubmit"
+                                data-dojo-type="dijit.form.Button"
                                 type="submit">Cancel Request</button>
                         </span>
                     </span>
diff --git a/Open-ILS/src/templates/acq/picklist/view.tt2 b/Open-ILS/src/templates/acq/picklist/view.tt2
index a209c3eda7..b6d613d2b9 100644
--- a/Open-ILS/src/templates/acq/picklist/view.tt2
+++ b/Open-ILS/src/templates/acq/picklist/view.tt2
@@ -1,6 +1,6 @@
 [% WRAPPER 'base.tt2' %]
 [% ctx.page_title = 'Selection List' %]
-<div dojoType="dijit.layout.ContentPane" style="height:100%">
+<div data-dojo-type="dijit.layout.ContentPane" style="height:100%">
     <div class='container'>
         <div id='oils-acq-picklist-header'>
             Selection list <span id='oils-acq-picklist-name'> </span>
diff --git a/Open-ILS/src/templates/acq/po/edi_messages.tt2 b/Open-ILS/src/templates/acq/po/edi_messages.tt2
index c936616bb2..e65174c4ad 100644
--- a/Open-ILS/src/templates/acq/po/edi_messages.tt2
+++ b/Open-ILS/src/templates/acq/po/edi_messages.tt2
@@ -6,10 +6,10 @@
 <h1>EDI Messages</h1>
 [% END  %]
 <br/>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="edimGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="edimGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             defaultCellWidth="'auto'"
             query="{id: '*'}"
             [% IF ctx.page_args.0 %]
diff --git a/Open-ILS/src/templates/acq/po/events.tt2 b/Open-ILS/src/templates/acq/po/events.tt2
index 03c183e609..6a8e72ccb2 100644
--- a/Open-ILS/src/templates/acq/po/events.tt2
+++ b/Open-ILS/src/templates/acq/po/events.tt2
@@ -2,28 +2,28 @@
 
 <!-- grid -->
 
- <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+ <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
             <div>PO Triggered Events</div>
             <div>
-                <button dojoType="dijit.form.Button" onClick="eventGrid.cancelSelected()">Cancel Selected</button>
-                <button dojoType="dijit.form.Button" onClick="eventGrid.resetSelected()">Reset Selected</button>
+                <button data-dojo-type="dijit.form.Button" onClick="eventGrid.cancelSelected()">Cancel Selected</button>
+                <button data-dojo-type="dijit.form.Button" onClick="eventGrid.resetSelected()">Reset Selected</button>
             </div>
         </div>
         <div class="oils-acq-basic-form-div">
             <span>
                 <label for="state">State</label>
                 <select name="state"
-                    dojoType="dijit.form.FilteringSelect"
-                    jsId="eventStateSelect"
+                    data-dojo-type="dijit.form.FilteringSelect"
+                    data-dojo-id="eventStateSelect"
                     searchAttr="name"
                     labelAttr="name"></select>
             </span>
             <span>
                 <label for="orgUnit">Context Org Unit</label>
                 <select name="orgUnit" 
-                    dojoType="openils.widget.OrgUnitFilteringSelect" 
-                    jsId="eventContextOrgSelect"
+                    data-dojo-type="openils.widget.OrgUnitFilteringSelect" 
+                    data-dojo-id="eventContextOrgSelect"
                     searchAttr="shortname" 
                     labelAttr="shortname"></select>
             </span>
@@ -31,20 +31,20 @@
                 <label for="startDate">Start Date Range</label>
                 <input name="startDate"
                     type="text"
-                    dojoType="dijit.form.DateTextBox"
-                    jsId="eventStartDatePicker" />
+                    data-dojo-type="dijit.form.DateTextBox"
+                    data-dojo-id="eventStartDatePicker" />
             </span>
             <span>
                 <label for="endDate">End Date Range</label>
                 <input name="endDate"
                     type="text"
-                    dojoType="dijit.form.DateTextBox"
-                    jsId="eventEndDatePicker" />
+                    data-dojo-type="dijit.form.DateTextBox"
+                    data-dojo-id="eventEndDatePicker" />
             </span>
-            <button dojoType="dijit.form.Button" onClick="eventGrid.doSearch()">Search</button>
+            <button data-dojo-type="dijit.form.Button" onClick="eventGrid.doSearch()">Search</button>
         </div>
-        <table  jsId="eventGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="eventGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 query="{id: '*'}"
                 fmClass="atev"
                 suppressFields="['update_process','user_data','template_output','error_output','async_output','event_def']"
diff --git a/Open-ILS/src/templates/acq/po/history.tt2 b/Open-ILS/src/templates/acq/po/history.tt2
index ad9200794a..24e36e55a9 100644
--- a/Open-ILS/src/templates/acq/po/history.tt2
+++ b/Open-ILS/src/templates/acq/po/history.tt2
@@ -2,10 +2,10 @@
 [% ctx.page_title = "PO History" %]
 <h1>Purchase Order History</h1>
 <br/>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="pohGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="pohGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             defaultCellWidth="'auto'"
             fieldOrder="['audit_time', 'name', 'state', 'ordering_agency', 'provider', 'create_time', 'edit_time', 'order_date', 'creator', 'editor', 'owner']"
             query="{audit_id: '*'}"
diff --git a/Open-ILS/src/templates/acq/po/search.tt2 b/Open-ILS/src/templates/acq/po/search.tt2
index ff3a1c1c92..ff78e339c4 100644
--- a/Open-ILS/src/templates/acq/po/search.tt2
+++ b/Open-ILS/src/templates/acq/po/search.tt2
@@ -27,7 +27,7 @@
 </script>
 
 
-<form dojoType='dijit.form.Form' action='' method='' id='oils-acq-po-search-form'>
+<form data-dojo-type='dijit.form.Form' action='' method='' id='oils-acq-po-search-form'>
 
     <script type="dojo/method" event="onSubmit">
         doSearch(this.getValues());
@@ -37,7 +37,7 @@
     <div class='oils-acq-basic-form-div'>
 
         <label for='id'>ID</label>
-        <input dojoType='dijit.form.NumberTextBox' name='id'> </input>
+        <input data-dojo-type='dijit.form.NumberTextBox' name='id'> </input>
 
         <label for='provider'>Provider</label>
         <input id='po-search-provider-selector'/>
@@ -60,7 +60,7 @@
                 }
             });
         </script>
-        <input dojoType='dijit.form.FilteringSelect' 
+        <input data-dojo-type='dijit.form.FilteringSelect' 
             name='state' 
             required='false' 
             store='stateStore' 
@@ -71,21 +71,21 @@
         <label for='ordering_agency'>Ordering Agency</label>
         <input id='po-search-agency-selector'/>
 
-        <span dojoType='dijit.form.Button' type='submit'>Search</span>
+        <span data-dojo-type='dijit.form.Button' type='submit'>Search</span>
     </div>
     <div class="oils-acq-basic-form-div">
-        <input dojoType="dijit.form.CheckBox" value="1" name="metapo_view"
+        <input data-dojo-type="dijit.form.CheckBox" value="1" name="metapo_view"
             id="metapo_view" type="checkbox" />
         <label for="metapo_view">Show results as a virtual combined PO</label>
     </div>
 </form>
 <br/>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" id="holds_po_grid">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" id="holds_po_grid">
     <table 
             id="po-grid" 
             autoHeight='true'
-            jsId="poGrid" 
-            dojoType="openils.widget.AutoGrid" 
+            data-dojo-id="poGrid" 
+            data-dojo-type="openils.widget.AutoGrid" 
             query="{id: '*'}" 
             fieldOrder="['id', 'owner', 'ordering_agency', 'provider', 'create_time', 'edit_time', 'state']"
             suppressFields="['owner', 'editor', 'creator']"
diff --git a/Open-ILS/src/templates/acq/po/view.tt2 b/Open-ILS/src/templates/acq/po/view.tt2
index ec2c9ea8d8..3e30b6f994 100644
--- a/Open-ILS/src/templates/acq/po/view.tt2
+++ b/Open-ILS/src/templates/acq/po/view.tt2
@@ -1,6 +1,6 @@
 [% WRAPPER 'base.tt2' %]
 [% ctx.page_title = "Purchase Order" %]
-<div dojoType="dijit.layout.ContentPane" style="height:100%">
+<div data-dojo-type="dijit.layout.ContentPane" style="height:100%">
     <div>
         <div id='oils-acq-picklist-header'>
             <big>
@@ -55,18 +55,18 @@
                     <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"
+                        <button data-dojo-type="dijit.form.Button"
                             id="acq-po-view-invoice-link">
                             View Invoices
                             (<span id="acq-po-view-invoice-count"></span>)
                         </button> &nbsp;
-                        <button dojoType="dijit.form.Button"
+                        <button data-dojo-type="dijit.form.Button"
                             id="acq-po-create-invoice-link">
                             Create Invoice
                         </button> &nbsp;
-                        <button dojoType="dijit.form.DropDownButton">
+                        <button data-dojo-type="dijit.form.DropDownButton">
                             <span>Link Invoice</span>
-                            <div dojoType="dijit.TooltipDialog"
+                            <div data-dojo-type="dijit.TooltipDialog"
                                 id="acq-po-link-invoice">
                                 <script type="dojo/connect" event="onOpen">
                                     if (!invoiceLinkDialogManager) {
@@ -89,15 +89,15 @@
                     <td>
                         <span id="acq-po-view-cancel-reason"></span>
                         <span id="acq-po-choose-cancel-reason" class="hidden">
-                            <span dojoType="dijit.form.DropDownButton">
+                            <span data-dojo-type="dijit.form.DropDownButton">
                                 <span>Cancel order</span>
-                                <span dojoType="dijit.TooltipDialog">
+                                <span data-dojo-type="dijit.TooltipDialog">
                                     <label for="acq-po-cancel-reason">
                                         Reason:
                                     </label>
                                     <span id="acq-po-cancel-reason"></span>
-                                    <button jsId="acqPoCancelReasonSubmit"
-                                        dojoType="dijit.form.Button"
+                                    <button data-dojo-id="acqPoCancelReasonSubmit"
+                                        data-dojo-type="dijit.form.Button"
                                         type="submit">Cancel order</button>
                                 </span>
                             </span>
diff --git a/Open-ILS/src/templates/acq/receiving/process.tt2 b/Open-ILS/src/templates/acq/receiving/process.tt2
index 17ff83cc25..eaa1bbffb1 100644
--- a/Open-ILS/src/templates/acq/receiving/process.tt2
+++ b/Open-ILS/src/templates/acq/receiving/process.tt2
@@ -1,7 +1,7 @@
 [% WRAPPER base.tt2 %]
     <h1>Receiving Processing</h1><br/>
     <div id='oils-acq-recv-search-block' class='container'>
-        <form dojoType='dijit.form.Form' action='' method=''>
+        <form data-dojo-type='dijit.form.Form' action='' method=''>
             <script type="dojo/method" event="onSubmit">
                 doSearch(this.getValues());
                 return false; /* don't redirect */
@@ -10,23 +10,23 @@
                 <tr>
                     <td><label for='identifier'>Identifier</label></td>
                     <td>
-                        <input dojoType='dijit.form.TextBox' name='identifier'/>
+                        <input data-dojo-type='dijit.form.TextBox' name='identifier'/>
                     </td>
                 </tr>
                 <tr>
                     <td><label for="name">Ordering Agency:</label></td>
                     <td>
-                        <input dojoType="openils.widget.OrgUnitFilteringSelect" jsId='orderingAgencySelect'
+                        <input data-dojo-type="openils.widget.OrgUnitFilteringSelect" data-dojo-id='orderingAgencySelect'
                             searchAttr="shortname" name="ordering_agency" autocomplete="true" labelAttr='shortname'> </input>
                     </td>
                 </tr>
                 <tr>
-                    <td colspan='2'><div dojoType='dijit.form.Button' type='submit'>Search</div></td>
+                    <td colspan='2'><div data-dojo-type='dijit.form.Button' type='submit'>Search</div></td>
                 </tr>
             </table>
         </form>
     </div>
-    <div dojoType="dijit.ProgressBar" style="width:300px" jsId="searchProgress" id="searchProgress"></div>
+    <div data-dojo-type="dijit.ProgressBar" style="width:300px" data-dojo-id="searchProgress" id="searchProgress"></div>
     <script type="text/javascript">dojo.style('searchProgress', 'visibility', 'hidden');</script>
     <div id='oils-acq-recv-grid' style='height:100%'>
         [% grid_jsid = 'liGrid'; domprefix = 'oils-acq-recv' %]
diff --git a/Open-ILS/src/templates/acq/search/unified.tt2 b/Open-ILS/src/templates/acq/search/unified.tt2
index 41b3a6018e..c5dc915fe9 100644
--- a/Open-ILS/src/templates/acq/search/unified.tt2
+++ b/Open-ILS/src/templates/acq/search/unified.tt2
@@ -97,7 +97,7 @@
         <table
             id="acq-unified-po-grid"
             autoHeight="true"
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             query="{id: '*'}"
             fieldOrder="['name', 'owner', 'ordering_agency', 'provider',
                 'create_time', 'edit_time', 'state']"
@@ -116,53 +116,53 @@
     </div>
     <div id="acq-unified-results-picklist" class="hidden">
         <div class="acq-unified-result-specific-controls">
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="dijit.byId('acq-unified-pl-grid').refresh();">
                 Refresh Grid
             </button>
-            <div dojoType="dijit.form.DropDownButton">
+            <div data-dojo-type="dijit.form.DropDownButton">
                 <span>New Selection List</span>
-                <div dojoType="dijit.TooltipDialog"
+                <div data-dojo-type="dijit.TooltipDialog"
                     execute="createPl(arguments[0]);">
                     <table class="dijitTooltipTable">
                         <tr>
                             <td><label for="name">Name:</label></td>
-                            <td><input dojoType="dijit.form.TextBox"
+                            <td><input data-dojo-type="dijit.form.TextBox"
                                 name="name"/></td>
                         </tr>
                         <tr>
                             <td colspan="2" align="center">
-                                <button dojoType="dijit.form.Button"
+                                <button data-dojo-type="dijit.form.Button"
                                     type="submit">Create</button>
                             </td>
                         </tr>
                     </table>
                 </div>
             </div>
-            <div dojoType="dijit.form.DropDownButton">
+            <div data-dojo-type="dijit.form.DropDownButton">
                 <span>Clone Selected</span>
-                <div dojoType="dijit.TooltipDialog"
+                <div data-dojo-type="dijit.TooltipDialog"
                     execute="cloneSelectedPl(arguments[0]);">
                     <table class="dijitTooltipTable">
                         <tr>
                             <td><label for="name">New Name:</label></td>
-                            <td><input dojoType="dijit.form.TextBox"
+                            <td><input data-dojo-type="dijit.form.TextBox"
                                 name="name"/></td>
                         </tr>
                         <tr>
                             <td colspan="2" align="center">
-                                <button dojoType="dijit.form.Button"
+                                <button data-dojo-type="dijit.form.Button"
                                     type="submit">Clone</button>
                             </td>
                         </tr>
                     </table>
                 </div>
             </div>
-            <div dojoType="dijit.form.DropDownButton">
+            <div data-dojo-type="dijit.form.DropDownButton">
                 <span>Merge Selected</span>
-                <div dojoType="dijit.TooltipDialog"
+                <div data-dojo-type="dijit.TooltipDialog"
                     execute="mergeSelectedPl(arguments[0]);"
-                    jsId="plMergeDialog">
+                    data-dojo-id="plMergeDialog">
                     <script type="dojo/connect" event="onOpen">
                         loadLeadPlSelector();
                     </script>
@@ -170,26 +170,26 @@
                         <tr>
                             <td><label for="name">Choose the Lead
                                  Selection List:</label></td>
-                             <td><input jsId="plMergeLeadSelector"
-                                 dojoType="dijit.form.FilteringSelect"
+                             <td><input data-dojo-id="plMergeLeadSelector"
+                                 data-dojo-type="dijit.form.FilteringSelect"
                                  name="lead" /></td>
                         </tr>
                         <tr>
                             <td colspan="2" align="center">
-                                <button dojoType="dijit.form.Button"
+                                <button data-dojo-type="dijit.form.Button"
                                     type="submit">Merge</button>
                             </td>
                         </tr>
                     </table>
                 </div>
             </div>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onclick="deleteSelectedPl();">Delete Selected</button>
         </div>
         <table
             id="acq-unified-pl-grid"
             autoHeight="true"
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             query="{id: '*'}"
             fieldOrder="['name', 'owner', 'entry_count',
                 'create_time', 'edit_time']"
@@ -220,7 +220,7 @@
         <table
             id="acq-unified-inv-grid"
             autoHeight="true"
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             query="{id: '*'}"
             fieldOrder="['inv_ident', 'receiver', 'provider', 'shipper']"
             defaultCellWidth="'auto'"
@@ -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>
+    <div data-dojo-id='progressDialog' data-dojo-type='openils.widget.ProgressDialog'></div>
 </div>
 [% END %]
diff --git a/Open-ILS/src/templates/acq/settings/li_attr.tt2 b/Open-ILS/src/templates/acq/settings/li_attr.tt2
index d096f9662e..ae68374d52 100644
--- a/Open-ILS/src/templates/acq/settings/li_attr.tt2
+++ b/Open-ILS/src/templates/acq/settings/li_attr.tt2
@@ -1,31 +1,31 @@
 [% WRAPPER base.tt2 %]
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top">
-    <div dojoType="dijit.form.DropDownButton">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top">
+    <div data-dojo-type="dijit.form.DropDownButton">
         <span>Lineitem Attribute Attribute</span>
-        <div dojoType="dijit.TooltipDialog" execute="createOrderRecordField(arguments[0]);">
+        <div data-dojo-type="dijit.TooltipDialog" execute="createOrderRecordField(arguments[0]);">
             <script type='dojo/connect' event='onOpen'>//setORDesc();</script>
             <table class='dijitTooltipTable'>
                 <tr>
                     <td><label for="code">Code:</label></td>
-                    <td><input dojoType='dijit.form.TextBox' name='code'/></td>
+                    <td><input data-dojo-type='dijit.form.TextBox' name='code'/></td>
                 </tr>
                 <tr>
                     <td><label for="description">Description: </label></td>
-                    <td><input id='oils-acq-provider-or-desc' dojoType="dijit.form.TextBox" name="description"> </input></td>
+                    <td><input id='oils-acq-provider-or-desc' data-dojo-type="dijit.form.TextBox" name="description"> </input></td>
                 </tr>
                 <tr>
                     <td><label for="amount">Tag: </label></td>
-                    <td><input dojoType="dijit.form.TextBox" name="tag"></input></td>
+                    <td><input data-dojo-type="dijit.form.TextBox" name="tag"></input></td>
                 </tr>
                 <tr>
                     <td><label for="amount">Subfield: </label></td>
-                    <td><input dojoType="dijit.form.TextBox" name="subfield"></input></td>
+                    <td><input data-dojo-type="dijit.form.TextBox" name="subfield"></input></td>
                 </tr>
                 <tr>
                     <td><label for="ident">Identifer Field?: </label></td>
                     <td>
-                        <select dojoType="dijit.form.FilteringSelect" name="ident">
+                        <select data-dojo-type="dijit.form.FilteringSelect" name="ident">
                             <option value='f' selected='selected'>False</option>
                             <option value='t'>True</option>
                         </select>
@@ -33,11 +33,11 @@
                 </tr>
                 <tr>
                     <td><label for="amount">XPath (advanced): </label></td>
-                    <td><input dojoType="dijit.form.TextBox" name="xpath"></input></td>
+                    <td><input data-dojo-type="dijit.form.TextBox" name="xpath"></input></td>
                 </tr>
                 <tr>
                     <td colspan='2' align='center'>
-                        <button dojoType=dijit.form.Button type="submit">Apply</button>
+                        <button data-dojo-type=dijit.form.Button type="submit">Apply</button>
                     </td>
                 </tr>
             </table>
@@ -56,16 +56,16 @@
             ]]
         }];
     </script>
-    <div dojoType="dijit.layout.TabContainer">
-        <div dojoType="dijit.layout.ContentPane" 
+    <div data-dojo-type="dijit.layout.TabContainer">
+        <div data-dojo-type="dijit.layout.ContentPane" 
                 class='oils-acq-detail-content-pane' title="MARC Attributes" style='height:600px;'>
             <script type='dojo/connect' event='onShow'>loadMarcAttrGrid();</script>
-            <div jsId='liMarcAttrGrid' dojoType="dojox.Grid" structure='liAttrGridLayout'> </div>
+            <div data-dojo-id='liMarcAttrGrid' data-dojo-type="dojox.Grid" structure='liAttrGridLayout'> </div>
         </div>
-        <div dojoType="dijit.layout.ContentPane" 
+        <div data-dojo-type="dijit.layout.ContentPane" 
                 class='oils-acq-detail-content-pane' title="Generated Attributes" style='height:600px;'>
             <script type='dojo/connect' event='onShow'>loadGeneratedAttrGrid();</script>
-            <div jsId='liGeneratedAttrGrid' dojoType="dojox.Grid" structure='liAttrGridLayout'> </div>
+            <div data-dojo-id='liGeneratedAttrGrid' data-dojo-type="dojox.Grid" structure='liAttrGridLayout'> </div>
         </div>
     </div>
 </div>
diff --git a/Open-ILS/src/templates/actor/user/register.tt2 b/Open-ILS/src/templates/actor/user/register.tt2
index 554127d5e3..6b036210a4 100644
--- a/Open-ILS/src/templates/actor/user/register.tt2
+++ b/Open-ILS/src/templates/actor/user/register.tt2
@@ -3,7 +3,7 @@
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/actor/user/register.js'></script>
 <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/register.css" />
 
-<div dojoType="dijit.form.Form" id="myForm" jsId="myForm" encType="multipart/form-data" action="" method="">
+<div data-dojo-type="dijit.form.Form" id="myForm" data-dojo-id="myForm" encType="multipart/form-data" action="" method="">
     <script type="dojo/method" event="onSubmit">
         /* we don't want to use the form action, but uEditSave and UEditSaveClone from the Save buttons.  We
             do want to use the Form's validation features, which we do from within UEditSave, etc. */
@@ -15,8 +15,8 @@
 </div>
 
 <div id='uedit-save-div'>
-    <button dojoType='dijit.form.Button' jsId='saveButton' onClick='uEditSave' scrollOnFocus='false'></button>
-    <button dojoType='dijit.form.Button' jsId='saveCloneButton' onClick='uEditSaveClone' scrollOnFocus='false'></button>
+    <button data-dojo-type='dijit.form.Button' data-dojo-id='saveButton' onClick='uEditSave' scrollOnFocus='false'></button>
+    <button data-dojo-type='dijit.form.Button' data-dojo-id='saveCloneButton' onClick='uEditSaveClone' scrollOnFocus='false'></button>
     <div id='require-toggle'>
         <a href='javascript:uEditToggleRequired(1);' id='uedit-show-required'>Show Only Required Fields</a><br id='uedit-show-required-br'/>
         <a href='javascript:uEditToggleRequired(2);' id='uedit-show-suggested'>Show Suggested Fields</a><br id='uedit-show-suggested-br'/>
@@ -46,10 +46,10 @@
 </div>
 
 <div class='hidden'>
-    <div jsId="progressDialog" dojoType="openils.widget.ProgressDialog"></div>
+    <div data-dojo-id="progressDialog" data-dojo-type="openils.widget.ProgressDialog"></div>
     <span id='true' style='color:green;'>&#x2713;</span>
     <span id='false' style='color:red;'>&#x2717;</span>
-    <div dojoType='dijit.Dialog' jsId='allCardsDialog'>
+    <div data-dojo-type='dijit.Dialog' data-dojo-id='allCardsDialog'>
         <table class='oils-generic-table' style='margin:10px;'>
             <thead>
                 <tr>
@@ -68,8 +68,8 @@
             <tbody>
                 <tr>
                     <td colspan='3' style='text-align:center;'>
-                        <button jsId='allCardsClose' dojoType='dijit.form.Button' onClick='allCardsDialog.hide()' scrollOnFocus='false'>Close</button>
-                        <span id='uedit-apply-card-changes'><button jsId='allCardsApply' dojoType='dijit.form.Button' onClick='applyCardChanges()' scrollOnFocus='false'>Apply Changes</button></span>
+                        <button data-dojo-id='allCardsClose' data-dojo-type='dijit.form.Button' onClick='allCardsDialog.hide()' scrollOnFocus='false'>Close</button>
+                        <span id='uedit-apply-card-changes'><button data-dojo-id='allCardsApply' data-dojo-type='dijit.form.Button' onClick='applyCardChanges()' scrollOnFocus='false'>Apply Changes</button></span>
                     </td>
                 </tr>
             </tbody>
diff --git a/Open-ILS/src/templates/actor/user/register_table.tt2 b/Open-ILS/src/templates/actor/user/register_table.tt2
index 775a19ae30..2c9052d12f 100644
--- a/Open-ILS/src/templates/actor/user/register_table.tt2
+++ b/Open-ILS/src/templates/actor/user/register_table.tt2
@@ -2,12 +2,12 @@
     <tr fmclass='ac' fmfield='barcode' required='required'>
         <td/><td/><td/>
         <td>
-            <button dojoType='dijit.form.Button' jsId='replaceBarcode' scrollOnFocus='false'></button>
+            <button data-dojo-type='dijit.form.Button' data-dojo-id='replaceBarcode' scrollOnFocus='false'></button>
             <span id='uedit-dupe-barcode-warning' style='color:red; font-weight:bold' class='hidden'>
             </span>
         </td>
         <td id='uedit-all-barcodes'>
-            <button dojoType='dijit.form.Button' jsId='allCards' scrollOnFocus='false'></button>
+            <button data-dojo-type='dijit.form.Button' data-dojo-id='allCards' scrollOnFocus='false'></button>
         </td>
     </tr>
     <tr fmclass='au' fmfield='usrname' required='required'>
@@ -20,7 +20,7 @@
     <tr fmclass='au' fmfield='passwd' required='required'>
         <td/><td/><td/>
         <td>
-            <button dojoType='dijit.form.Button' jsId='generatePassword' scrollOnFocus='false' tabIndex='-1'></button>
+            <button data-dojo-type='dijit.form.Button' data-dojo-id='generatePassword' scrollOnFocus='false' tabIndex='-1'></button>
         </td>
     </tr>
     <tr fmclass='au' fmfield='passwd2' required='required'><td/><td id='verifyPassword'></td><td/></tr>
@@ -63,14 +63,14 @@
         <td>
             <span name='mailingAddress'></span><input type='radio' name='mailing_address'>
             <span name='billingAddress'></span><input type='radio' name='billing_address'>
-            <button dojoType='dijit.form.Button' scrollOnFocus='false' name='delete-button' class='uedit-addr-del-button'>X</button>
+            <button data-dojo-type='dijit.form.Button' scrollOnFocus='false' name='delete-button' class='uedit-addr-del-button'>X</button>
         </td>
     </tr>
 
     <tr name='uedit-addr-pending-row' type='addr-template' class='pending-addr-row hidden'>
         <td colspan='3'>
             <span style='padding-right:10px;' name='addressPending'></span>
-            <button dojoType='dijit.form.Button' scrollOnFocus='false'  name='approve-button'></button>
+            <button data-dojo-type='dijit.form.Button' scrollOnFocus='false'  name='approve-button'></button>
             <div name='replaced-addr-div'>
                 <div name='replaced-addr'></div>
             </div>
@@ -98,7 +98,7 @@
 
     <tr id='new-addr-row' class='newaddr-row' required='show'>
         <td colspan='0' style='text-align:center;'>
-            <button dojoType='dijit.form.Button' onClick='uEditNewAddr' scrollOnFocus='false' name='addressNew'></button>
+            <button data-dojo-type='dijit.form.Button' onClick='uEditNewAddr' scrollOnFocus='false' name='addressNew'></button>
         </td>
     </tr>
 
diff --git a/Open-ILS/src/templates/actor/user/trigger_events.tt2 b/Open-ILS/src/templates/actor/user/trigger_events.tt2
index ec0c2f4c59..a28afb3676 100644
--- a/Open-ILS/src/templates/actor/user/trigger_events.tt2
+++ b/Open-ILS/src/templates/actor/user/trigger_events.tt2
@@ -3,16 +3,16 @@
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/actor/user/trigger_events.js'></script>
 <script type="text/javascript">patronId = '[% ctx.page_args.0 %]'</script>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
     <div>User Events</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='evtCancelSelected()'>Cancel Selected Events</button>
+        <button data-dojo-type='dijit.form.Button' onClick='evtCancelSelected()'>Cancel Selected Events</button>
     </div>
 </div>
 
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:100%;'> 
-    <table jsId="evtGrid" dojoType="dojox.grid.DataGrid" query="{id: '*'}">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:100%;'> 
+    <table data-dojo-id="evtGrid" data-dojo-type="dojox.grid.DataGrid" query="{id: '*'}">
         <thead> 
             <tr> 
                 <th field="event_def" get='getField' width='auto'>Event Def.</th> 
diff --git a/Open-ILS/src/templates/base.tt2 b/Open-ILS/src/templates/base.tt2
index b26a9524d4..a4238f4394 100644
--- a/Open-ILS/src/templates/base.tt2
+++ b/Open-ILS/src/templates/base.tt2
@@ -19,14 +19,14 @@
     </head>
     <body class='tundra'>
         [% INCLUDE login.tt2 %] <!-- shared login page -->
-        <div id="oils-base-body-block" class="tundra" dojoType="dijit.layout.LayoutContainer"> 
-            <div id="oils-base-header-block" dojoType="dijit.layout.ContentPane" layoutAlign="top">
+        <div id="oils-base-body-block" class="tundra" data-dojo-type="dijit.layout.LayoutContainer"> 
+            <div id="oils-base-header-block" data-dojo-type="dijit.layout.ContentPane" layoutAlign="top">
                 <div id='oils-base-header-auto-login-block'>
                     [% INCLUDE header.tt2 %]
                 </div>
             </div>
-            <div id="oils-base-main-block" dojoType="dijit.layout.LayoutContainer" layoutAlign="client">
-                <div id="oils-base-content-block" dojoType="dijit.layout.ContentPane" layoutAlign="client">
+            <div id="oils-base-main-block" data-dojo-type="dijit.layout.LayoutContainer" layoutAlign="client">
+                <div id="oils-base-content-block" data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
                     [% content %]
                 </div>
             </div>
diff --git a/Open-ILS/src/templates/booking/pickup.tt2 b/Open-ILS/src/templates/booking/pickup.tt2
index d8784c9a52..8d3f451d0a 100644
--- a/Open-ILS/src/templates/booking/pickup.tt2
+++ b/Open-ILS/src/templates/booking/pickup.tt2
@@ -15,8 +15,8 @@
     <div class="nice_vertical_padding" id="contains_ready_bresv">
         <h3 class="booking AUTO_ready_bresv"></h3>
         <div class="AUTO_no_ready_bresv" id="no_ready_bresv"></div>
-        <table id="ready_bresv" jsId="ready_bresv"
-            dojoType="dojox.grid.DataGrid" query="{id: '*'}"
+        <table id="ready_bresv" data-dojo-id="ready_bresv"
+            data-dojo-type="dojox.grid.DataGrid" query="{id: '*'}"
             rowSelector="20px" autoHeight="true" width="auto">
             <thead>
                 <tr><!-- FIXME: i18n problem: init_auto_l10n() runs
@@ -40,8 +40,8 @@
         <hr />
         <h3 class="booking AUTO_out_bresv"></h3>
         <div class="AUTO_no_out_bresv" id="no_out_bresv"></div>
-        <table id="out_bresv" jsId="out_bresv"
-            dojoType="dojox.grid.DataGrid" query="{id: '*'}"
+        <table id="out_bresv" data-dojo-id="out_bresv"
+            data-dojo-type="dojox.grid.DataGrid" query="{id: '*'}"
             rowSelector="20px" autoHeight="true" width="auto">
             <thead>
                 <tr><!-- FIXME: i18n problem: init_auto_l10n() runs
diff --git a/Open-ILS/src/templates/booking/pull_list.tt2 b/Open-ILS/src/templates/booking/pull_list.tt2
index 002855f0b2..80338a47e7 100644
--- a/Open-ILS/src/templates/booking/pull_list.tt2
+++ b/Open-ILS/src/templates/booking/pull_list.tt2
@@ -9,8 +9,8 @@
         <div id="owning_lib_selector_row" class="nice_vertical_padding">
             <label for="owning_lib_selector" class="AUTO_owning_lib_selector">
             </label>
-            <select dojoType="openils.widget.OrgUnitFilteringSelect"
-                id="owning_lib_selector" jsId="owning_lib_selector"
+            <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+                id="owning_lib_selector" data-dojo-id="owning_lib_selector"
                 searchAttr="shortname" labelAttr="shortname"></select>
         </div>
         <div id="interval_input_row" class="nice_vertical_padding">
diff --git a/Open-ILS/src/templates/booking/reservation.tt2 b/Open-ILS/src/templates/booking/reservation.tt2
index ece7c5836e..2d67cb89ae 100644
--- a/Open-ILS/src/templates/booking/reservation.tt2
+++ b/Open-ILS/src/templates/booking/reservation.tt2
@@ -44,8 +44,8 @@
                 <div id="pickup_lib_selector_row" class="nice_vertical_padding">
                     <label for="pickup_lib_selector"
                         class="AUTO_pickup_lib_selector"></label>
-                    <select dojoType="openils.widget.OrgUnitFilteringSelect"
-                        id="pickup_lib_selector" jsId="pickup_lib_selector"
+                    <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+                        id="pickup_lib_selector" data-dojo-id="pickup_lib_selector"
                         searchAttr="shortname" labelAttr="shortname"></select>
                 </div>
                 <div id="contain_email_notify" class="nice_vertical_padding">
@@ -89,8 +89,8 @@
         <hr />
         <h2 class="booking" id="existing_reservation_patron_line"></h2>
         <div id="bresv_grid_alt_explanation"></div>
-        <table id="bresv_grid" jsId="bresvGrid"
-            dojoType="dojox.grid.DataGrid" query="{id: '*'}"
+        <table id="bresv_grid" data-dojo-id="bresvGrid"
+            data-dojo-type="dojox.grid.DataGrid" query="{id: '*'}"
             rowSelector="20px" autoHeight="true" width="auto">
             <thead>
                 <tr><!-- FIXME: i18n problem: init_auto_l10n() runs
diff --git a/Open-ILS/src/templates/booking/return.tt2 b/Open-ILS/src/templates/booking/return.tt2
index 40e1a32fc9..739c84001b 100644
--- a/Open-ILS/src/templates/booking/return.tt2
+++ b/Open-ILS/src/templates/booking/return.tt2
@@ -22,8 +22,8 @@
     <div class="nice_vertical_padding" id="contains_out_bresv">
         <h3 class="booking AUTO_out_bresv"></h3>
         <div class="AUTO_no_out_bresv" id="no_out_bresv"></div>
-        <table id="out_bresv" jsId="out_bresv"
-            dojoType="dojox.grid.DataGrid" query="{id: '*'}"
+        <table id="out_bresv" data-dojo-id="out_bresv"
+            data-dojo-type="dojox.grid.DataGrid" query="{id: '*'}"
             rowSelector="20px" autoHeight="true" width="auto">
             <thead>
                 <tr><!-- FIXME: i18n problem: init_auto_l10n() runs
@@ -47,8 +47,8 @@
         <hr />
         <h3 class="booking AUTO_in_bresv"></h3>
         <div class="AUTO_no_in_bresv" id="no_in_bresv"></div>
-        <table id="in_bresv" jsId="in_bresv"
-            dojoType="dojox.grid.DataGrid" query="{id: '*'}"
+        <table id="in_bresv" data-dojo-id="in_bresv"
+            data-dojo-type="dojox.grid.DataGrid" query="{id: '*'}"
             rowSelector="20px" autoHeight="true" width="auto">
             <thead>
                 <tr><!-- FIXME: i18n problem: init_auto_l10n() runs
diff --git a/Open-ILS/src/templates/cat/authority/list.tt2 b/Open-ILS/src/templates/cat/authority/list.tt2
index 216a4cb8a7..d6aa8c4219 100644
--- a/Open-ILS/src/templates/cat/authority/list.tt2
+++ b/Open-ILS/src/templates/cat/authority/list.tt2
@@ -10,18 +10,18 @@
     .authority-control-set .acs-name { font-weight: bold; }
     .authority-control-set .acs-id { }
 </style>
-<div dojoType="dijit.form.Form" id="myForm" jsId="myForm" encType="multipart/form-data" action="" method="">
+<div data-dojo-type="dijit.form.Form" id="myForm" data-dojo-id="myForm" encType="multipart/form-data" action="" method="">
     <span style="white-space: nowrap;">
         <label for="authTerm">Search term: </label>
-        <input type="text" name="authTerm" value="" dojoType="dijit.form.TextBox" trim="true" id="authTerm" propercase="false"/>
+        <input type="text" name="authTerm" value="" data-dojo-type="dijit.form.TextBox" trim="true" id="authTerm" propercase="false"/>
     </span>
     <span style="white-space: nowrap;">
         <label for="authAxis">Authority type: </label>
         <input
             id="authAxis"
             name="authAxis"
-            jsId="authAxis"
-            dojoType="openils.widget.PCrudAutocompleteBox"
+            data-dojo-id="authAxis"
+            data-dojo-type="openils.widget.PCrudAutocompleteBox"
             fmclass="aba"
             searchAttr="name"
             fetchProperties="{ sort: [{attribute:'name'}] }"
@@ -32,19 +32,19 @@
         />
     </span>
 <!-- Not currently useful - see authOUListInit() above -->
-<!--    <label for="authOU">Library: </label><select dojoType="openils.widget.OrgUnitFilteringSelect" id="authOU" name="authOU" searchAttr="shortname" labelAttr="shortname"></select> -->
+<!--    <label for="authOU">Library: </label><select data-dojo-type="openils.widget.OrgUnitFilteringSelect" id="authOU" name="authOU" searchAttr="shortname" labelAttr="shortname"></select> -->
 
     <span style="white-space: nowrap;">
-        <span dojoType="dijit.form.Button" type="button" value="Previous">Previous
+        <span data-dojo-type="dijit.form.Button" type="button" value="Previous">Previous
             <script type="dojo/method" event="onClick" args="evt">
                 displayRecords({"page":"prev"});
             </script>
         </span>
 
         <label for="authPage">Page: </label>
-        <input dojoType="dijit.form.NumberSpinner" value="0" constraints="{min:-100,max:100,places:0}" smallDelta="1" id="authPage" name="authPage" style="width:5em;" />
+        <input data-dojo-type="dijit.form.NumberSpinner" value="0" constraints="{min:-100,max:100,places:0}" smallDelta="1" id="authPage" name="authPage" style="width:5em;" />
 
-        <span dojoType="dijit.form.Button" type="button" value="Next">Next
+        <span data-dojo-type="dijit.form.Button" type="button" value="Next">Next
             <script type="dojo/method" event="onClick" args="evt">
                 displayRecords({"page":"next"});
             </script>
@@ -52,7 +52,7 @@
     </span>
 
     <span style="white-space: nowrap;">
-        <span dojoType="dijit.form.Button" type="button" value="Submit">Submit
+        <span data-dojo-type="dijit.form.Button" type="button" value="Submit">Submit
             <script type="dojo/method" event="onClick" args="evt">
                 displayRecords();
             </script>
@@ -64,13 +64,13 @@
 
 <div id='mergebox-div' class='hidden' style='float:right; border: 4px solid; width: 25%;'>
     <div style="border-bottom: 4px solid; text-align: center;">
-        <div dojoType="dijit.form.Form" encType="multipart/form-data" action="" method="">
-            <div dojoType="dijit.form.Button" type="button" value="Merge">Merge
+        <div data-dojo-type="dijit.form.Form" encType="multipart/form-data" action="" method="">
+            <div data-dojo-type="dijit.form.Button" type="button" value="Merge">Merge
                 <script type="dojo/method" event="onClick" args="evt">
                     mergeRecords();
                 </script>
             </div>
-            <div dojoType="dijit.form.Button" type="button" value="Clear">Clear
+            <div data-dojo-type="dijit.form.Button" type="button" value="Clear">Clear
                 <script type="dojo/method" event="onClick" args="evt">
                     clearMergeRecords();
                 </script>
diff --git a/Open-ILS/src/templates/circ/hold_pull_list.tt2 b/Open-ILS/src/templates/circ/hold_pull_list.tt2
index fc497b9225..8ae5530ec4 100644
--- a/Open-ILS/src/templates/circ/hold_pull_list.tt2
+++ b/Open-ILS/src/templates/circ/hold_pull_list.tt2
@@ -42,26 +42,26 @@
     );
 
 </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
         <div>Hold Pull List</div>
         <div>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="grid.print();">Print Pull List</button>
         </div>
     </div>
     <div class="oils-acq-basic-roomy">
         <label for="org_selector">Show the pull list for:</label>
         <select
-            id="org_selector" jsId="org_selector"
-            dojoType="openils.widget.OrgUnitFilteringSelect"
+            id="org_selector" data-dojo-id="org_selector"
+            data-dojo-type="openils.widget.OrgUnitFilteringSelect"
             searchAttr="name" labelAttr="name">
         </select>
     </div>
     <table
         jsid="grid"
-        dojoType="openils.widget.FlattenerGrid"
+        data-dojo-type="openils.widget.FlattenerGrid"
         columnPersistKey='"circ.hold_pull_list"'
         autoHeight="10"
         editOnEnter="false"
diff --git a/Open-ILS/src/templates/circ/selfcheck/banner.tt2 b/Open-ILS/src/templates/circ/selfcheck/banner.tt2
index cda4866c91..e839e1c358 100644
--- a/Open-ILS/src/templates/circ/selfcheck/banner.tt2
+++ b/Open-ILS/src/templates/circ/selfcheck/banner.tt2
@@ -4,7 +4,7 @@
 </div>
 <div id='oils-selfck-scan-div'>
     <div id='oils-selfck-scan-text'></div>
-    <input jsId='selfckScanBox' dojoType='dijit.form.TextBox'/>
+    <input data-dojo-id='selfckScanBox' data-dojo-type='dijit.form.TextBox'/>
 </div>
 <div id='oils-selfck-status-div'></div>
 
diff --git a/Open-ILS/src/templates/circ/selfcheck/main.tt2 b/Open-ILS/src/templates/circ/selfcheck/main.tt2
index 6790bb8b41..346aa1ae28 100644
--- a/Open-ILS/src/templates/circ/selfcheck/main.tt2
+++ b/Open-ILS/src/templates/circ/selfcheck/main.tt2
@@ -34,22 +34,22 @@
         [% INCLUDE 'circ/selfcheck/summary.tt2' %]
     </div>
 </div>
-<div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div>
-<div dojoType="dijit.Dialog" jsId='oilsSelfckWsDialog' class='oils-login-dialog' style='display:none;'>
+<div data-dojo-type='openils.widget.ProgressDialog' data-dojo-id='progressDialog'></div>
+<div data-dojo-type="dijit.Dialog" data-dojo-id='oilsSelfckWsDialog' class='oils-login-dialog' style='display:none;'>
     <form>
         <table>
             <tr>
                 <td>Choose a location</td>
-                <td><div dojoType='openils.widget.OrgUnitFilteringSelect' jsId='oilsSelfckWsLocSelector' 
+                <td><div data-dojo-type='openils.widget.OrgUnitFilteringSelect' data-dojo-id='oilsSelfckWsLocSelector' 
                     searchAttr='shortname' labelAttr='shortname'></div></td>
             </tr>
             <tr>
                 <td>Enter a workstation name</td>
-                <td><input dojoType='dijit.form.TextBox' jsId='oilsSelfckWsName'/></td>
+                <td><input data-dojo-type='dijit.form.TextBox' data-dojo-id='oilsSelfckWsName'/></td>
             </tr>
             <tr>
                 <td colspan='2' align='center'>
-                    <button jsId='oilsSelfckWsSubmit' dojoType='dijit.form.Button'>Submit</button>
+                    <button data-dojo-id='oilsSelfckWsSubmit' data-dojo-type='dijit.form.Button'>Submit</button>
                 </td>
             </tr>
         </table>
diff --git a/Open-ILS/src/templates/circ/selfcheck/patron_login.tt2 b/Open-ILS/src/templates/circ/selfcheck/patron_login.tt2
index da65d791de..4818b7ce74 100644
--- a/Open-ILS/src/templates/circ/selfcheck/patron_login.tt2
+++ b/Open-ILS/src/templates/circ/selfcheck/patron_login.tt2
@@ -1,7 +1,7 @@
 <div>Please login using your library barcode</div>
 <div class='oils-selfck-login-box'>
-    <input jsId='selfckBarcodeBox' dojoType='dijit.form.TextBox'></input>
+    <input data-dojo-id='selfckBarcodeBox' data-dojo-type='dijit.form.TextBox'></input>
 </div>
 <div id='oils-selfck-login-pw' class='hidden oils-selfck-login-box'>
-    <input jsId='selfckPwBox' dojoType='dijit.form.TextBox'></input>
+    <input data-dojo-id='selfckPwBox' data-dojo-type='dijit.form.TextBox'></input>
 </div>
diff --git a/Open-ILS/src/templates/circ/selfcheck/payment.tt2 b/Open-ILS/src/templates/circ/selfcheck/payment.tt2
index b7d1ccc2a6..e20fdd7a1e 100644
--- a/Open-ILS/src/templates/circ/selfcheck/payment.tt2
+++ b/Open-ILS/src/templates/circ/selfcheck/payment.tt2
@@ -7,7 +7,7 @@
         <tr>
             <td>Type of Card</td>
             <td>
-                <select dojoType='dijit.form.FilteringSelect' jsId='oilsSelfckCCType' required='true'>
+                <select data-dojo-type='dijit.form.FilteringSelect' data-dojo-id='oilsSelfckCCType' required='true'>
                     <option value='VISA'>VISA</option>
                     <option value='MasterCard'>MasterCard</option>
                     <option value='American Express'>American Express</option>
@@ -17,16 +17,16 @@
         -->
         <tr>
             <td>Credit Card #</td>
-            <td><input dojoType='dijit.form.TextBox' jsId='oilsSelfckCCNumber' required='true'/></td>
+            <td><input data-dojo-type='dijit.form.TextBox' data-dojo-id='oilsSelfckCCNumber' required='true'/></td>
         </tr>
         <tr>
             <td>CVV #</td>
-            <td><input dojoType='dijit.form.TextBox' jsId='oilsSelfckCCCVV' required='true'/></td>
+            <td><input data-dojo-type='dijit.form.TextBox' data-dojo-id='oilsSelfckCCCVV' required='true'/></td>
         </tr>
         <tr>
             <td>Expiration Month</td>
             <td>
-                <select dojoType='dijit.form.FilteringSelect' jsId='oilsSelfckCCMonth' required='true'>
+                <select data-dojo-type='dijit.form.FilteringSelect' data-dojo-id='oilsSelfckCCMonth' required='true'>
                     <option value='01' selected='selected'>Jan</option>
                     <option value='02'>Feb</option>
                     <option value='03'>Mar</option>
@@ -44,39 +44,39 @@
         </tr>
         <tr>
             <td>Expiration Year</td>
-            <td><input dojoType='dijit.form.NumberSpinner' constraints='{pattern:"0000", places:0, maxlength:4}' jsId='oilsSelfckCCYear' required='true'/></td>
+            <td><input data-dojo-type='dijit.form.NumberSpinner' constraints='{pattern:"0000", places:0, maxlength:4}' data-dojo-id='oilsSelfckCCYear' required='true'/></td>
         </tr>
         <tr>
             <td>Edit Billing Details</td>
-            <td><input dojoType='dijit.form.CheckBox' jsId='oilsSelfckEditDetails'/></td>
+            <td><input data-dojo-type='dijit.form.CheckBox' data-dojo-id='oilsSelfckEditDetails'/></td>
         </tr>
         <tr>
             <td>First Name</td>
-            <td><input dojoType='dijit.form.TextBox' jsId='oilsSelfckCCFName' disabled='disabled' required='true'/></td>
+            <td><input data-dojo-type='dijit.form.TextBox' data-dojo-id='oilsSelfckCCFName' disabled='disabled' required='true'/></td>
         </tr>
         <tr>
             <td>Last Name</td>
-            <td><input dojoType='dijit.form.TextBox' jsId='oilsSelfckCCLName' disabled='disabled' required='true'/></td>
+            <td><input data-dojo-type='dijit.form.TextBox' data-dojo-id='oilsSelfckCCLName' disabled='disabled' required='true'/></td>
         </tr>
         <tr>
             <td>Street Address</td>
-            <td><input dojoType='dijit.form.TextBox' jsId='oilsSelfckCCStreet' disabled='disabled' required='true'/></td>
+            <td><input data-dojo-type='dijit.form.TextBox' data-dojo-id='oilsSelfckCCStreet' disabled='disabled' required='true'/></td>
         </tr>
         <tr>
             <td>City</td>
-            <td><input dojoType='dijit.form.TextBox' jsId='oilsSelfckCCCity' disabled='disabled' required='true'/></td>
+            <td><input data-dojo-type='dijit.form.TextBox' data-dojo-id='oilsSelfckCCCity' disabled='disabled' required='true'/></td>
         </tr>
         <tr>
             <td>State or Province</td>
-            <td><input dojoType='dijit.form.TextBox' jsId='oilsSelfckCCState' disabled='disabled' required='true'/></td>
+            <td><input data-dojo-type='dijit.form.TextBox' data-dojo-id='oilsSelfckCCState' disabled='disabled' required='true'/></td>
         </tr>
         <tr>
             <td>ZIP or Postal Code</td>
-            <td><input dojoType='dijit.form.TextBox' jsId='oilsSelfckCCZip' disabled='disabled' required='true'/></td>
+            <td><input data-dojo-type='dijit.form.TextBox' data-dojo-id='oilsSelfckCCZip' disabled='disabled' required='true'/></td>
         </tr>
         <tr>
             <td colspan='2' align='center'>
-                <button dojoType='dijit.form.Button' jsId='oilsSelfckCCSubmit'>Submit Payment</button>
+                <button data-dojo-type='dijit.form.Button' data-dojo-id='oilsSelfckCCSubmit'>Submit Payment</button>
             </td>
         </tr>
     </tbody>
diff --git a/Open-ILS/src/templates/conify/global/acq/cancel_reason.tt2 b/Open-ILS/src/templates/conify/global/acq/cancel_reason.tt2
index 63597a614b..daaa71cc3f 100644
--- a/Open-ILS/src/templates/conify/global/acq/cancel_reason.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/cancel_reason.tt2
@@ -4,21 +4,21 @@
 
 <!-- grid -->
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>PO / Item / Request Cancellation Reasons</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='crGrid.showCreateDialog()'>New Cancel Reason</button>
-                <button dojoType='dijit.form.Button' onClick='crGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='crGrid.showCreateDialog()'>New Cancel Reason</button>
+                <button data-dojo-type='dijit.form.Button' onClick='crGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
         <div>
             <span>Context Org Unit</span>
-            <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='contextOrgSelector'
+            <select data-dojo-type="openils.widget.OrgUnitFilteringSelect" data-dojo-id='contextOrgSelector'
                 searchAttr='shortname' labelAttr='shortname'> </select>
         </div>
-        <table  jsId="crGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="crGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 fieldOrder="['id', 'org_unit', 'label', 'description']"
                 query="{id: '*'}"
                 defaultCellWidth='"auto"'
diff --git a/Open-ILS/src/templates/conify/global/acq/claim_event_type.tt2 b/Open-ILS/src/templates/conify/global/acq/claim_event_type.tt2
index 6931809db5..9eccb34727 100644
--- a/Open-ILS/src/templates/conify/global/acq/claim_event_type.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/claim_event_type.tt2
@@ -1,7 +1,7 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Claim Event Types' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
         <div>Claim Event Types</div>
         <div>
@@ -14,13 +14,13 @@
     <div class="oils-acq-basic-roomy">
         <span>Show claim event types available to</span>
         <select
-            dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId="ownerSelect" searchAttr="shortname"
+            data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id="ownerSelect" searchAttr="shortname"
             labelAttr="shortname">
         </select>
     </div>
-    <table jsId="grid"
-        dojoType="openils.widget.AutoGrid"
+    <table data-dojo-id="grid"
+        data-dojo-type="openils.widget.AutoGrid"
         fieldOrder="['code', 'org_unit', 'description']"
         suppressFields="['id']"
         query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/acq/claim_policy.tt2 b/Open-ILS/src/templates/conify/global/acq/claim_policy.tt2
index 8409db1237..17c65a0294 100644
--- a/Open-ILS/src/templates/conify/global/acq/claim_policy.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/claim_policy.tt2
@@ -1,8 +1,8 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Claim Policies' %]
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
         <div>Claim Policies</div>
         <div>
@@ -13,13 +13,13 @@
     <div class="oils-acq-basic-roomy">
         <span>Show claim policies available to</span>
         <select
-            dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId="ownerSelect" searchAttr="shortname"
+            data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id="ownerSelect" searchAttr="shortname"
             labelAttr="shortname">
         </select>
     </div>
-    <table jsId="grid"
-        dojoType="openils.widget.AutoGrid"
+    <table data-dojo-id="grid"
+        data-dojo-type="openils.widget.AutoGrid"
         fieldOrder="['name', 'org_unit', 'description']"
         suppressFields="['id']"
         query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/acq/claim_policy_action.tt2 b/Open-ILS/src/templates/conify/global/acq/claim_policy_action.tt2
index a50c0ddc1e..a2dd0dd5c6 100644
--- a/Open-ILS/src/templates/conify/global/acq/claim_policy_action.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/claim_policy_action.tt2
@@ -1,8 +1,8 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Claim Policy Actions' %]
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
         <div>Claim Policy Actions</div>
         <div>
@@ -12,8 +12,8 @@
             <button onclick="grid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
-    <table jsId="grid"
-        dojoType="openils.widget.AutoGrid"
+    <table data-dojo-id="grid"
+        data-dojo-type="openils.widget.AutoGrid"
         suppressFields="['id']"
         query="{id: '*'}"
         defaultCellWidth="20"
diff --git a/Open-ILS/src/templates/conify/global/acq/claim_type.tt2 b/Open-ILS/src/templates/conify/global/acq/claim_type.tt2
index e9fc2eec41..c054baf53e 100644
--- a/Open-ILS/src/templates/conify/global/acq/claim_type.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/claim_type.tt2
@@ -1,8 +1,8 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Claim Types' %]
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
         <div>Claim Types</div>
         <div>
@@ -13,13 +13,13 @@
     <div class="oils-acq-basic-roomy">
         <span>Show claim types available to</span>
         <select
-            dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId="ownerSelect" searchAttr="shortname"
+            data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id="ownerSelect" searchAttr="shortname"
             labelAttr="shortname">
         </select>
     </div>
-    <table jsId="grid"
-        dojoType="openils.widget.AutoGrid"
+    <table data-dojo-id="grid"
+        data-dojo-type="openils.widget.AutoGrid"
         fieldOrder="['code', 'org_unit', 'description']"
         suppressFields="['id']"
         query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2 b/Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2
index a877a0817c..91d8f102d4 100644
--- a/Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2
@@ -2,17 +2,17 @@
 [% ctx.page_title = 'Distribution Formulas' %]
 
 <div id='formula-list-div'>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
             <div>Distribution Formulas</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='fListGrid.showCreateDialog()'>New Formula</button>
-                <button dojoType='dijit.form.Button' onClick='fListGrid.deleteSelected()'>Delete Selected</button>
-                <button dojoType='dijit.form.Button' onClick='cloneSelectedFormula()'>Clone Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='fListGrid.showCreateDialog()'>New Formula</button>
+                <button data-dojo-type='dijit.form.Button' onClick='fListGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='cloneSelectedFormula()'>Clone Selected</button>
             </div>
         </div>
-        <table  jsId="fListGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="fListGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 fieldOrder="['id', 'name', 'owner', 'item_count']"
                 suppressFields="['skip_count']"
                 query="{id: '*'}"
@@ -32,16 +32,16 @@
 
 
 <div id='formula-entry-div'>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
         <div><a href='javascript:void(0);' id="formula_head"></a></div>
         <div>
         </div>
     </div>
     <br/>
     <div>
-        <button dojoType='dijit.form.Button' onClick='addEntry()'>New Entry</button>
+        <button data-dojo-type='dijit.form.Button' onClick='addEntry()'>New Entry</button>
         <span style='padding-right:20px;'></span>
-        <button dojoType='dijit.form.Button' onClick='saveFormula()'>Apply Changes</button>
+        <button data-dojo-type='dijit.form.Button' onClick='saveFormula()'>Apply Changes</button>
     </div>
     <br/>
     <table class='oils-generic-table'>
@@ -56,7 +56,7 @@
         </thead>
         <tbody id='formula-entry-tbody'>
             <tr id='formula-entry-tempate'>
-                <td><div name='delete' dojoType='dijit.form.Button' style='color:red;' scrollOnFocus='false'>X</div></td>
+                <td><div name='delete' data-dojo-type='dijit.form.Button' style='color:red;' scrollOnFocus='false'>X</div></td>
                 <td><div name='owning_lib'></td>
                 <td><div name='location'></td>
                 <td><div name='item_count'></td>
@@ -70,9 +70,9 @@
     </table>
     <br/>
     <div>
-        <button dojoType='dijit.form.Button' onClick='addEntry()'>New Entry</button>
+        <button data-dojo-type='dijit.form.Button' onClick='addEntry()'>New Entry</button>
         <span style='padding-right:20px;'></span>
-        <button dojoType='dijit.form.Button' onClick='saveFormula()'>Apply Changes</button>
+        <button data-dojo-type='dijit.form.Button' onClick='saveFormula()'>Apply Changes</button>
     </div>
 </div>
 
diff --git a/Open-ILS/src/templates/conify/global/acq/edi_account.tt2 b/Open-ILS/src/templates/conify/global/acq/edi_account.tt2
index 9707c742cc..57603a1b1d 100644
--- a/Open-ILS/src/templates/conify/global/acq/edi_account.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/edi_account.tt2
@@ -6,25 +6,25 @@
 </style>
 
 <div id='main-list-div'>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='top'>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='top'>
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>EDI Accounts</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='pListGrid.showCreateDialog()'>New Account</button>
-                <button dojoType='dijit.form.Button' onClick='pListGrid.deleteSelected()'>Delete Selected</button> 
+                <button data-dojo-type='dijit.form.Button' onClick='pListGrid.showCreateDialog()'>New Account</button>
+                <button data-dojo-type='dijit.form.Button' onClick='pListGrid.deleteSelected()'>Delete Selected</button> 
             </div>
         </div>
     </div>
     <!--
     <div>
         <span>Context Org Unit</span>
-        <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='btContextOrgSelect'
+        <select data-dojo-type="openils.widget.OrgUnitFilteringSelect" data-dojo-id='btContextOrgSelect'
             searchAttr='shortname' labelAttr='shortname'> </select>
     </div>
     -->
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <table  jsId="pListGrid"
-                dojoType="openils.widget.AutoGrid"
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+        <table  data-dojo-id="pListGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 fieldOrder="['id', 'label', 'host', 'username', 'password', 'account', 'owner', 'last_activity', 'provider', 'path', 'in_dir', 'vendacct', 'vendcode']"
                 requiredFields="['label', 'host', 'provider', 'owner']"
                 query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/acq/exchange_rate.tt2 b/Open-ILS/src/templates/conify/global/acq/exchange_rate.tt2
index 8991b4720e..8de04b5ea9 100644
--- a/Open-ILS/src/templates/conify/global/acq/exchange_rate.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/exchange_rate.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Exchange Rates' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
     <div>Exchange Rates</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='erGrid.showCreateDialog()'>New Exchange Rate</button>
-        <button dojoType='dijit.form.Button' onClick='erGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='erGrid.showCreateDialog()'>New Exchange Rate</button>
+        <button data-dojo-type='dijit.form.Button' onClick='erGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="erGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="erGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['id', 'from_currency', 'to_currency', 'ratio']"
             defaultCellWidth='12'
             query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/acq/fund_tag.tt2 b/Open-ILS/src/templates/conify/global/acq/fund_tag.tt2
index f1a875dd6f..9198796217 100644
--- a/Open-ILS/src/templates/conify/global/acq/fund_tag.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/fund_tag.tt2
@@ -1,27 +1,27 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Fund Tags' %]
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/fund_tag.js"> </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
         <div>Fund Tags</div>
         <div>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="ftGrid.showCreateDialog()">New Fund Tag</button>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="ftGrid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
     <div class="oils-acq-basic-roomy">
         <span>Show tags available to</span>
         <select
-            dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId="ftOwnerSelect"
+            data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id="ftOwnerSelect"
             searchAttr="shortname" labelAttr="shortname">
         </select>
     </div>
-    <table jsId="ftGrid"
-        dojoType="openils.widget.AutoGrid"
+    <table data-dojo-id="ftGrid"
+        data-dojo-type="openils.widget.AutoGrid"
         fieldOrder="['id', 'owner', 'name']"
         query="{id: '*'}"
         fmClass="acqft"
diff --git a/Open-ILS/src/templates/conify/global/acq/invoice_item_type.tt2 b/Open-ILS/src/templates/conify/global/acq/invoice_item_type.tt2
index a03837231e..094ef4537b 100644
--- a/Open-ILS/src/templates/conify/global/acq/invoice_item_type.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/invoice_item_type.tt2
@@ -1,15 +1,15 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Invoice Item Types' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
     <div>Invoice Item Types</div>
     <div>
-        <button dojoType="dijit.form.Button" onClick="aiitGrid.showCreateDialog();">New Invoice Item Type</button>
-        <button dojoType="dijit.form.Button" onClick="aiitGrid.deleteSelected();">Delete Selected</button>
+        <button data-dojo-type="dijit.form.Button" onClick="aiitGrid.showCreateDialog();">New Invoice Item Type</button>
+        <button data-dojo-type="dijit.form.Button" onClick="aiitGrid.deleteSelected();">Delete Selected</button>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="aiitGrid"
-            dojoType="openils.widget.AutoGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="aiitGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['code', 'name', 'prorate']"
             defaultCellWidth="'auto'"
             query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/acq/invoice_payment_method.tt2 b/Open-ILS/src/templates/conify/global/acq/invoice_payment_method.tt2
index e24fd0863d..2607f1135d 100644
--- a/Open-ILS/src/templates/conify/global/acq/invoice_payment_method.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/invoice_payment_method.tt2
@@ -1,15 +1,15 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Invoice Payment Methods' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
     <div>Invoice Payment Methods</div>
     <div>
-        <button dojoType="dijit.form.Button" onClick="acqipmGrid.showCreateDialog();">New Invoice Payment Method</button>
-        <button dojoType="dijit.form.Button" onClick="acqipmGrid.deleteSelected();">Delete Selected</button>
+        <button data-dojo-type="dijit.form.Button" onClick="acqipmGrid.showCreateDialog();">New Invoice Payment Method</button>
+        <button data-dojo-type="dijit.form.Button" onClick="acqipmGrid.deleteSelected();">Delete Selected</button>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="acqipmGrid"
-            dojoType="openils.widget.AutoGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="acqipmGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['code', 'name']"
             defaultCellWidth="'auto'"
             query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/acq/lineitem_alert.tt2 b/Open-ILS/src/templates/conify/global/acq/lineitem_alert.tt2
index 7ac3f94d2f..d565081ca5 100644
--- a/Open-ILS/src/templates/conify/global/acq/lineitem_alert.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/lineitem_alert.tt2
@@ -4,21 +4,21 @@
 
 <!-- grid -->
 
- <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Line Item Alert Text</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='alertGrid.showCreateDialog()'>New Line Item Alert Text</button>
-                <button dojoType='dijit.form.Button' onClick='alertGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='alertGrid.showCreateDialog()'>New Line Item Alert Text</button>
+                <button data-dojo-type='dijit.form.Button' onClick='alertGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
         <div>
             <span>Context Org Unit</span>
-            <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='alertContextOrgSelect'
+            <select data-dojo-type="openils.widget.OrgUnitFilteringSelect" data-dojo-id='alertContextOrgSelect'
                 searchAttr='shortname' labelAttr='shortname'> </select>
         </div>
-        <table  jsId="alertGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="alertGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 fieldOrder="['id', 'code', 'description', 'owning_lib']"
                 query="{id: '*'}"
                 defaultCellWidth='20'
diff --git a/Open-ILS/src/templates/conify/global/acq/lineitem_marc_attr_def.tt2 b/Open-ILS/src/templates/conify/global/acq/lineitem_marc_attr_def.tt2
index 6504100d44..a2c2cc1f82 100644
--- a/Open-ILS/src/templates/conify/global/acq/lineitem_marc_attr_def.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/lineitem_marc_attr_def.tt2
@@ -4,16 +4,16 @@
 
 <!-- grid -->
 
- <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Line Item MARC Attribute Definition Editor</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='attrGrid.showCreateDialog()'>New Attribute</button>
-                <button dojoType='dijit.form.Button' onClick='attrGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='attrGrid.showCreateDialog()'>New Attribute</button>
+                <button data-dojo-type='dijit.form.Button' onClick='attrGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
-        <table  jsId="attrGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="attrGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 fieldOrder="['id', 'code', 'description', 'tag', 'subfield', 'ident', 'remove', 'xpath']"
                 query="{id: '*'}"
                 defaultCellWidth='"auto"'
diff --git a/Open-ILS/src/templates/conify/global/acq/provider.tt2 b/Open-ILS/src/templates/conify/global/acq/provider.tt2
index cb47934460..a6068a20c3 100644
--- a/Open-ILS/src/templates/conify/global/acq/provider.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/provider.tt2
@@ -1,26 +1,26 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Providers' %]
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client'>
     <div id='provider-list-div'>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Provider</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='pListGrid.showCreatePane()'>New Provider</button>
-                <button dojoType='dijit.form.Button' onClick='pListGrid.deleteSelected()'>Delete Selected</button> 
+                <button data-dojo-type='dijit.form.Button' onClick='pListGrid.showCreatePane()'>New Provider</button>
+                <button data-dojo-type='dijit.form.Button' onClick='pListGrid.deleteSelected()'>Delete Selected</button> 
             </div>
         </div>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
             <span>Context Org Unit</span>
-            <select dojoType="openils.widget.OrgUnitFilteringSelect"
-                jsId='contextOrgSelector'
+            <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+                data-dojo-id='contextOrgSelector'
                 searchAttr='shortname'
                 labelAttr='shortname'>
             </select>
         </div>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-            <table  jsId="pListGrid"
-                    dojoType="openils.widget.AutoGrid"
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+            <table  data-dojo-id="pListGrid"
+                    data-dojo-type="openils.widget.AutoGrid"
                     fieldOrder="['id', 'name', 'code', 'owner', 'currency_type']"
                     query="{id: '*'}"
                     defaultCellWidth='"auto"'
@@ -36,19 +36,19 @@
 
     <div id='provider-summary-pane'></div>     
     <div id='provider-details-div' style='height:600px'>
-    <div dojoType="dijit.layout.TabContainer" style='height:100%' jsId='providerTabs'>
+    <div data-dojo-type="dijit.layout.TabContainer" style='height:100%' data-dojo-id='providerTabs'>
 
-        <div dojoType="dijit.layout.ContentPane" title='Provider Address' select='true' id='provider-address'>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+        <div data-dojo-type="dijit.layout.ContentPane" title='Provider Address' select='true' id='provider-address'>
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
                 <div>Provider Address</div>
                 <div>
-                <button dojoType='dijit.form.Button' onClick='paListGrid.showCreateDialog()'>New Provider Address</button>
-                <button dojoType='dijit.form.Button' onClick='paListGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='paListGrid.showCreateDialog()'>New Provider Address</button>
+                <button data-dojo-type='dijit.form.Button' onClick='paListGrid.deleteSelected()'>Delete Selected</button>
                 </div>
             </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:100px'>
-                <table  jsId="paListGrid"
-                        dojoType="openils.widget.AutoGrid"
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:100px'>
+                <table  data-dojo-id="paListGrid"
+                        data-dojo-type="openils.widget.AutoGrid"
                         fieldOrder="['id', 'address_type', 'provider', 'street1', 'street2', 'city', 'county', 'state', 'country', 'post_code']"
                         requiredFields="['street1', 'city', 'state', 'country', 'post_code']"
                         query="{id: '*'}"
@@ -59,17 +59,17 @@
             </div>
         </div>
 
-        <div dojoType="dijit.layout.ContentPane" title='Provider Contact' id='tab-pro-contact'>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+        <div data-dojo-type="dijit.layout.ContentPane" title='Provider Contact' id='tab-pro-contact'>
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
                 <div>Provider Contact</div>
                 <div>
-                <button dojoType='dijit.form.Button' onClick='pcListGrid.showCreateDialog()'>New Contact</button>
-                <button dojoType='dijit.form.Button' onClick='pcListGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='pcListGrid.showCreateDialog()'>New Contact</button>
+                <button data-dojo-type='dijit.form.Button' onClick='pcListGrid.deleteSelected()'>Delete Selected</button>
                 </div>
             </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:200px'>
-                <table  jsId="pcListGrid"
-                        dojoType="openils.widget.AutoGrid"
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:200px'>
+                <table  data-dojo-id="pcListGrid"
+                        data-dojo-type="openils.widget.AutoGrid"
                         fieldOrder="['id', 'name', 'provider', 'role', 'email']"
                         requiredFields="['name']"
                         defaultCellWidth='"auto"'
@@ -79,16 +79,16 @@
                 </table>
             </div>
           
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
                 <div>Contact Address</div>
                 <div>
-                    <button dojoType='dijit.form.Button' onClick='pcaListGrid.showCreateDialog()'>New Contact Address</button>
-                    <button dojoType='dijit.form.Button' onClick='pcaListGrid.deleteSelected()'>Delete Selected</button>
+                    <button data-dojo-type='dijit.form.Button' onClick='pcaListGrid.showCreateDialog()'>New Contact Address</button>
+                    <button data-dojo-type='dijit.form.Button' onClick='pcaListGrid.deleteSelected()'>Delete Selected</button>
                 </div>
             </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:200px'>
-                <table  jsId="pcaListGrid"
-                        dojoType="openils.widget.AutoGrid"
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:200px'>
+                <table  data-dojo-id="pcaListGrid"
+                        data-dojo-type="openils.widget.AutoGrid"
                         fieldOrder="['id', 'address_type', 'contact', 'street1', 'street2', 'city', 'county', 'state', 'country', 'post_code']"
                         requiredFields="['street1', 'city', 'state', 'country', 'post_code']"
                         query="{id: '*'}"
@@ -99,17 +99,17 @@
             </div>
            
         </div>
-        <div dojoType="dijit.layout.ContentPane" title='Attribute Definitions' id='tab-attr'>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+        <div data-dojo-type="dijit.layout.ContentPane" title='Attribute Definitions' id='tab-attr'>
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
                 <div> Attribute Definitions</div>
                 <div>
-                    <button dojoType='dijit.form.Button' onClick='padListGrid.showCreateDialog()'>New Attribute Definition</button>
-                    <button dojoType='dijit.form.Button' onClick='padListGrid.deleteSelected()'>Delete Selected</button>
+                    <button data-dojo-type='dijit.form.Button' onClick='padListGrid.showCreateDialog()'>New Attribute Definition</button>
+                    <button data-dojo-type='dijit.form.Button' onClick='padListGrid.deleteSelected()'>Delete Selected</button>
                 </div>
             </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:200px'>
-                <table  jsId="padListGrid"
-                        dojoType="openils.widget.AutoGrid"
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:200px'>
+                <table  data-dojo-id="padListGrid"
+                        data-dojo-type="openils.widget.AutoGrid"
                         fieldOrder="['id', 'provider', 'code', 'description',  'provider', 'ident', 'remove',  'tag', 'subfield', 'xpath']"
                         requiredFields="['code', 'description', 'xpath']"
                         query="{id: '*'}"
@@ -126,17 +126,17 @@
             </div>
         </div>
 
-        <div dojoType="dijit.layout.ContentPane" title='Holding Subfield' id='tab-hold'>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+        <div data-dojo-type="dijit.layout.ContentPane" title='Holding Subfield' id='tab-hold'>
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
                 <div>Holding Subfield</div>
                 <div>
-                <button dojoType='dijit.form.Button' onClick='phsListGrid.showCreateDialog()'>New Holding Subfield</button>
-                <button dojoType='dijit.form.Button' onClick='phsListGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='phsListGrid.showCreateDialog()'>New Holding Subfield</button>
+                <button data-dojo-type='dijit.form.Button' onClick='phsListGrid.deleteSelected()'>Delete Selected</button>
                 </div>
             </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:400px'>
-                <table  jsId="phsListGrid"
-                        dojoType="openils.widget.AutoGrid"
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:400px'>
+                <table  data-dojo-id="phsListGrid"
+                        data-dojo-type="openils.widget.AutoGrid"
                         fieldOrder="['id', 'provider', 'name', 'subfield']"
                         requiredFields="['name', 'subfield']"
                         query="{id: '*'}"
@@ -146,11 +146,11 @@
             </div>
         </div>
 
-        <div dojoType="dijit.layout.ContentPane" title="Invoices" id="tab-invoice">
+        <div data-dojo-type="dijit.layout.ContentPane" title="Invoices" id="tab-invoice">
             <big class="oils-acq-basic-roomy"><strong>Invoices</strong></big>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style="height:400px">
-                <table jsId="invListGrid"
-                    dojoType="openils.widget.AutoGrid"
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style="height:400px">
+                <table data-dojo-id="invListGrid"
+                    data-dojo-type="openils.widget.AutoGrid"
                     fieldOrder="['inv_ident', 'receiver', 'shipper']"
                     suppressFields="['id', 'provider']"
                     query="{id: '*'}"
@@ -168,7 +168,7 @@
     </div>
 
     <div class="hidden">
-        <select dojoType="dijit.form.FilteringSelect" jsId="nameSelect">
+        <select data-dojo-type="dijit.form.FilteringSelect" data-dojo-id="nameSelect">
             <option value='owning_lib'>Owning Library</option>
             <option value='quantity'>Quantity</option>
             <option value='call_number'>Call Number</option>
diff --git a/Open-ILS/src/templates/conify/global/action/survey.tt2 b/Open-ILS/src/templates/conify/global/action/survey.tt2
index 9b530ee8e8..5c6fcf14da 100644
--- a/Open-ILS/src/templates/conify/global/action/survey.tt2
+++ b/Open-ILS/src/templates/conify/global/action/survey.tt2
@@ -1,17 +1,17 @@
 [% WRAPPER base.tt2 %]
-   <div dojoType="dijit.layout.ContentPane" layoutAlign='top'>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+   <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='top'>
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Survey List</div>
             <div>
-                <button dojoType='dijit.form.Button' onclick='svNewSurvey();'>Add New Survey</button>
-                <button dojoType='dijit.form.Button' onclick='deleteFromGrid();'>Delete Selected</button>
-                <button dojoType='dijit.form.Button' onclick='endSurvey();'>End Selected Surveys</button>
+                <button data-dojo-type='dijit.form.Button' onclick='svNewSurvey();'>Add New Survey</button>
+                <button data-dojo-type='dijit.form.Button' onclick='deleteFromGrid();'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onclick='endSurvey();'>End Selected Surveys</button>
             </div>
         </div>
 
 <!-- grid -->
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:400px'>
-    <table jsId="svGrid" dojoType="dojox.grid.DataGrid" query="{id: '*'}">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:400px'>
+    <table data-dojo-id="svGrid" data-dojo-type="dojox.grid.DataGrid" query="{id: '*'}">
         <thead>
             <tr>
                 <th field="id">Survey ID</th>
@@ -29,48 +29,48 @@
     </table>    
 </div>
 
-<div style='display:none;' dojoType="dijit.Dialog" jsId='svSurveyDialog' title='New Survey' execute='svCreate(arguments[0]);'>
+<div style='display:none;' data-dojo-type="dijit.Dialog" data-dojo-id='svSurveyDialog' title='New Survey' execute='svCreate(arguments[0]);'>
 
         <table id='surveyDialog'>
             <tr>
                 <td>Name</td>
-                <td><input dojoType='dijit.form.TextBox' name='svName'/></td>
+                <td><input data-dojo-type='dijit.form.TextBox' name='svName'/></td>
             </tr>
             <tr>
                 <td>Description</td>
-                <td><input dojoType='dijit.form.TextBox' name='svDescription'></td>
+                <td><input data-dojo-type='dijit.form.TextBox' name='svDescription'></td>
             </tr>
             <tr>
                 <td>Owning Library</td>
-                <td><select dojoType='openils.widget.OrgUnitFilteringSelect' name='svOwner' jsId='asvOwningOrg' searchAttr='shortname' labelAttr='shortname'/></td>
+                <td><select data-dojo-type='openils.widget.OrgUnitFilteringSelect' name='svOwner' data-dojo-id='asvOwningOrg' searchAttr='shortname' labelAttr='shortname'/></td>
             </tr>
             <tr>
                 <td>Start Date</td>
-                <td><input dojoType='dijit.form.TextBox' name='svStart_date'></td>
+                <td><input data-dojo-type='dijit.form.TextBox' name='svStart_date'></td>
             </tr>
             <tr>
                 <td>End Date</td>
-                <td><input dojoType='dijit.form.TextBox' name='svEnd_date'></td>
+                <td><input data-dojo-type='dijit.form.TextBox' name='svEnd_date'></td>
             </tr>
             <tr>
                 <td>OPAC Survey?</td>
-                <td><input dojoType='dijit.form.CheckBox' name='svOpac'></td>
+                <td><input data-dojo-type='dijit.form.CheckBox' name='svOpac'></td>
             </tr>
             <tr>
                 <td>Poll Style?</td>
-                <td><input dojoType='dijit.form.CheckBox' name='svPoll'></td>
+                <td><input data-dojo-type='dijit.form.CheckBox' name='svPoll'></td>
             </tr>
             <tr>
                 <td>Is Required?</td>
-                <td><input dojoType='dijit.form.CheckBox' name='svRequired'></td>
+                <td><input data-dojo-type='dijit.form.CheckBox' name='svRequired'></td>
             </tr>
             <tr>
                 <td>Display in User Summary?</td>
-                <td><input dojoType='dijit.form.CheckBox' name='svUsr_summary'></td>
+                <td><input data-dojo-type='dijit.form.CheckBox' name='svUsr_summary'></td>
             </tr>
             <tr>
                 <td colspan='2' align='center'>
-                    <button jsId='createSave' dojoType='dijit.form.Button' type='submit'>Save Changes</button>
+                    <button data-dojo-id='createSave' data-dojo-type='dijit.form.Button' type='submit'>Save Changes</button>
 
                     
                 </td>
diff --git a/Open-ILS/src/templates/conify/global/action/survey/edit.tt2 b/Open-ILS/src/templates/conify/global/action/survey/edit.tt2
index fe4fdb568d..01f9e08734 100644
--- a/Open-ILS/src/templates/conify/global/action/survey/edit.tt2
+++ b/Open-ILS/src/templates/conify/global/action/survey/edit.tt2
@@ -3,7 +3,7 @@
 <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/theme/default/conify.css'/>
 
 <!-- General survey info -->
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <div id='edit-pane'> </div>
 
 </div>
diff --git a/Open-ILS/src/templates/conify/global/action_trigger/event_definition.tt2 b/Open-ILS/src/templates/conify/global/action_trigger/event_definition.tt2
index b3343afbb0..b814c4f048 100644
--- a/Open-ILS/src/templates/conify/global/action_trigger/event_definition.tt2
+++ b/Open-ILS/src/templates/conify/global/action_trigger/event_definition.tt2
@@ -4,7 +4,7 @@
 <script type="text/javascript">openils.Util.addOnLoad(loadEventDef)</script>
 
 <div class='hidden'>
-    <select dojoType='dijit.form.ComboBox' jsId='eventDefGranularity'>
+    <select data-dojo-type='dijit.form.ComboBox' data-dojo-id='eventDefGranularity'>
         <option value='hourly'>Hourly</option>
         <option value='daily'>Daily</option>
         <option value='weekly'>Weekly</option>
@@ -14,21 +14,21 @@
 </div>
 
 
-<div dojoType="dijit.layout.TabContainer" style='height:100%;' jsId='eventDefTabs'>
+<div data-dojo-type="dijit.layout.TabContainer" style='height:100%;' data-dojo-id='eventDefTabs'>
 
-    <div dojoType="dijit.layout.ContentPane" title='Event Definitions' id='tab-atevdef'>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" title='Event Definitions' id='tab-atevdef'>
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
             <div>Trigger Event Definitions</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='edGrid.showCreatePane()'>New</button>
-                <button dojoType='dijit.form.Button' onClick='edGrid.showClonePane(cloneEventEnv)'>Clone Selected</button>
-                <button dojoType='dijit.form.Button' onClick='edGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='edGrid.showCreatePane()'>New</button>
+                <button data-dojo-type='dijit.form.Button' onClick='edGrid.showClonePane(cloneEventEnv)'>Clone Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='edGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:460px'>
-            <table  jsId="edGrid" 
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:460px'>
+            <table  data-dojo-id="edGrid" 
                     autoHeight='true'
-                    dojoType="openils.widget.AutoGrid" 
+                    data-dojo-type="openils.widget.AutoGrid" 
                     fieldOrder="['owner', 'name', 'hook', 'active', 'delay', 'delay_field', 'group_field', 'reactor', 'validator']"
                     suppressFields="['usr_field', 'opt_in_setting', 'max_delay', 'template', 'cleanup_failure', 'cleanup_success']"
                     query="{id: '*'}" 
@@ -43,18 +43,18 @@
         </div>
     </div>
 
-    <div dojoType="dijit.layout.ContentPane" title='Hooks' id='tab-ath' style='height:100%;'>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" title='Hooks' id='tab-ath' style='height:100%;'>
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Trigger Hooks</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='thGrid.showCreateDialog()'>New</button>
-                <button dojoType='dijit.form.Button' onClick='thGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='thGrid.showCreateDialog()'>New</button>
+                <button data-dojo-type='dijit.form.Button' onClick='thGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
-            <table  jsId="thGrid" 
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
+            <table  data-dojo-id="thGrid" 
                     autoHeight='true'
-                    dojoType="openils.widget.AutoGrid" 
+                    data-dojo-type="openils.widget.AutoGrid" 
                     fieldOrder="['key', 'core_type', 'description', 'passive']"
                     query="{key: '*'}" 
                     fmClass='ath'
@@ -65,17 +65,17 @@
         </div>
     </div>
 
-    <div dojoType="dijit.layout.ContentPane" title='Reactors' id='tab-atreact'>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" title='Reactors' id='tab-atreact'>
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Trigger Reactors</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='trGrid.showCreateDialog()'>New</button>
-                <button dojoType='dijit.form.Button' onClick='trGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='trGrid.showCreateDialog()'>New</button>
+                <button data-dojo-type='dijit.form.Button' onClick='trGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
-            <table  jsId="trGrid" 
-                    dojoType="openils.widget.AutoGrid" 
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
+            <table  data-dojo-id="trGrid" 
+                    data-dojo-type="openils.widget.AutoGrid" 
                     query="{module: '*'}" 
                     fmClass='atreact'
                     showPaginator='true'
@@ -90,17 +90,17 @@
         </div>
     </div>
 
-    <div dojoType="dijit.layout.ContentPane" title='Validators' id='tab-atval'>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" title='Validators' id='tab-atval'>
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Trigger Validators</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='tvGrid.showCreateDialog()'>New</button>
-                <button dojoType='dijit.form.Button' onClick='tvGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='tvGrid.showCreateDialog()'>New</button>
+                <button data-dojo-type='dijit.form.Button' onClick='tvGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
-            <table  jsId="tvGrid" 
-                    dojoType="openils.widget.AutoGrid" 
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
+            <table  data-dojo-id="tvGrid" 
+                    data-dojo-type="openils.widget.AutoGrid" 
                     query="{module: '*'}" 
                     fmClass='atval'
                     showPaginator='true'
@@ -117,7 +117,7 @@
 
 </div>
 
-<div jsId='progressDialog' dojoType='openils.widget.ProgressDialog' indeterminate='true'></div>
+<div data-dojo-id='progressDialog' data-dojo-type='openils.widget.ProgressDialog' indeterminate='true'></div>
 
 [% END %]
 
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 19c504a05c..64f275e18e 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
@@ -1,21 +1,21 @@
 [% WRAPPER base.tt2 %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client'>
     <h2 id='at-event-def-name'/>
 </div>
 
-<div dojoType="dijit.layout.TabContainer" style='height:100%;' jsId='eventDefTabs'>
+<div data-dojo-type="dijit.layout.TabContainer" style='height:100%;' data-dojo-id='eventDefTabs'>
 
-    <div dojoType="dijit.layout.ContentPane" title='Event Environment' id='tab-atenv'>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" title='Event Environment' id='tab-atenv'>
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Trigger Event Environment</div>
             <div>   
-                <button dojoType='dijit.form.Button' onClick='teeGrid.showCreateDialog()'>New</button>
-                <button dojoType='dijit.form.Button' onClick='teeGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='teeGrid.showCreateDialog()'>New</button>
+                <button data-dojo-type='dijit.form.Button' onClick='teeGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
-            <table  jsId="teeGrid" 
-                    dojoType="openils.widget.AutoGrid" 
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
+            <table  data-dojo-id="teeGrid" 
+                    data-dojo-type="openils.widget.AutoGrid" 
                     fieldOrder="['id', 'event_def', 'path', 'collector', 'label']"
                     query="{id: '*'}" 
                     fmClass='atenv'
@@ -26,17 +26,17 @@
     </div>
 
 
-    <div dojoType="dijit.layout.ContentPane" title='Event Parameters' id='tab-atevparam'>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" title='Event Parameters' id='tab-atevparam'>
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Trigger Event Parameters</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='tepGrid.showCreateDialog()'>New</button>
-                <button dojoType='dijit.form.Button' onClick='tepGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='tepGrid.showCreateDialog()'>New</button>
+                <button data-dojo-type='dijit.form.Button' onClick='tepGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
-            <table  jsId="tepGrid" 
-                    dojoType="openils.widget.AutoGrid" 
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
+            <table  data-dojo-id="tepGrid" 
+                    data-dojo-type="openils.widget.AutoGrid" 
                     fieldOrder="['id', 'event_def', 'param', 'value']"
                     query="{id: '*'}" 
                     fmClass='atevparam'
@@ -46,13 +46,13 @@
         </div>
     </div>
 
-    <div dojoType="dijit.layout.ContentPane" title='Test' id='tab-test'>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" title='Test' id='tab-test'>
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Event Definition Tests</div>
             <div></div>
         </div>
         <br/>
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style='height:600px'>
             <div style='border:1px solid #aaa;' id='at-test-none'>
                 No tests for this type of event definition hook
             </div>
@@ -61,17 +61,17 @@
                 <table class='oils-generic-table'>
                     <tr>
                         <td>Barcode of Circulating Copy</td>
-                        <td><div dojoType='dijit.form.TextBox' jsId='circTestBarcode'></div></td>
+                        <td><div data-dojo-type='dijit.form.TextBox' data-dojo-id='circTestBarcode'></div></td>
                     </tr>
                     <tr>
-                        <td colspan='2'><button dojoType='dijit.form.Button' onclick='evtTestCirc'>Go</button></td>
+                        <td colspan='2'><button data-dojo-type='dijit.form.Button' onclick='evtTestCirc'>Go</button></td>
                     </tr>
                 </table>
             </div>
 
             <div id='test-event-output' style='width:90%;margin:20px;border:1px solid #aaa;' class='hidden'>
             </div>
-            <div jsId='progressDialog' dojoType='openils.widget.ProgressDialog' indeterminate='true'></div>
+            <div data-dojo-id='progressDialog' data-dojo-type='openils.widget.ProgressDialog' indeterminate='true'></div>
         </div>
     </div>
 
diff --git a/Open-ILS/src/templates/conify/global/actor/address_alert.tt2 b/Open-ILS/src/templates/conify/global/actor/address_alert.tt2
index 6350530f34..b46c893bb4 100644
--- a/Open-ILS/src/templates/conify/global/actor/address_alert.tt2
+++ b/Open-ILS/src/templates/conify/global/actor/address_alert.tt2
@@ -1,17 +1,17 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = l('Address Alert') %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>[% l('Address Alert') %]</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='addrAlertGrid.showCreateDialog()'>[% l('New Address Alert') %]</button>
-            <button dojoType='dijit.form.Button' onClick='addrAlertGrid.deleteSelected()'>[% l('Delete Selected') %]</button>
+            <button data-dojo-type='dijit.form.Button' onClick='addrAlertGrid.showCreateDialog()'>[% l('New Address Alert') %]</button>
+            <button data-dojo-type='dijit.form.Button' onClick='addrAlertGrid.deleteSelected()'>[% l('Delete Selected') %]</button>
         </div>
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
         <span>[% l('Context Org Unit') %]</span>
-        <select dojoType="openils.widget.OrgUnitFilteringSelect"
-                jsId='contextOrgSelector'
+        <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+                data-dojo-id='contextOrgSelector'
                 searchAttr='shortname'
                 labelAttr='shortname'>
         </select>
@@ -24,8 +24,8 @@
             [% |l %]* If the billing or mailing address fields are selected, the tested address must be a billing or mailing address to match.[% END %]<br/>
         </p>
     </div>
-    <table  jsId="addrAlertGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="addrAlertGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['owner', 'active', 'match_all', 'alert_message', 'street1', 'street2', 'city', 'county', 'state', 'country', 'post_code']"
             query="{field: '*'}"
             fmClass='aal'
diff --git a/Open-ILS/src/templates/conify/global/actor/org_unit_custom_tree.tt2 b/Open-ILS/src/templates/conify/global/actor/org_unit_custom_tree.tt2
index 9d259b026d..a2518988e3 100644
--- a/Open-ILS/src/templates/conify/global/actor/org_unit_custom_tree.tt2
+++ b/Open-ILS/src/templates/conify/global/actor/org_unit_custom_tree.tt2
@@ -42,7 +42,7 @@
             </td>
             <td style='vertical-align: bottom'>
                 <!-- 'opac' is currently the only purpose -->
-                <select jsId='treePurposeSelector' dojoType='dijit.form.FilteringSelect' disabled='disabled' onChange='drawMagicTree()'>
+                <select data-dojo-id='treePurposeSelector' data-dojo-type='dijit.form.FilteringSelect' disabled='disabled' onChange='drawMagicTree()'>
                     <option value='opac'>[% l('OPAC') %]</option>
                 </select>
             </td>
@@ -67,7 +67,7 @@
     </div>
 </div>
 
-<div jsId="progressDialog" dojoType="openils.widget.ProgressDialog"></div>
+<div data-dojo-id="progressDialog" data-dojo-type="openils.widget.ProgressDialog"></div>
 [% END %]
 
 
diff --git a/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2 b/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2
index 5466e11b4d..aa0ab500e9 100644
--- a/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2
+++ b/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2
@@ -52,14 +52,14 @@
 
 <div id='acplg-header'>
     <span>[% l('Copy Location Groups') %]</span>
-    <select dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId='contextOrgSelector'
+    <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id='contextOrgSelector'
             searchAttr='shortname'
             labelAttr='shortname'>
     </select>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" style="width:100%">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style="width:100%">
     <div class='acpl-content' style="float: left">
         <div>
             <table width='100%'><tr>
@@ -110,7 +110,7 @@
 </div>
 
 <div class='hidden'>
-    <div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div>
+    <div data-dojo-type='openils.widget.ProgressDialog' data-dojo-id='progressDialog'></div>
     <div id='dnd-drag-actions'>
         <table width='100%'><tr>
             <td nowrap='nowrap' align='left'>
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 ba4223f9a1..40a53ca4eb 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
@@ -3,28 +3,28 @@
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/asset/copy_location_order.js'> </script>
 <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/js/dojo/dojo/resources/dnd.css'/>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
     <div>Copy Location Order</div>
     <div></div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <span>Context Org Unit</span>
-    <select dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId='contextOrgSelector'
+    <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id='contextOrgSelector'
             searchAttr='shortname'
             labelAttr='shortname'>
     </select>
-    <button dojoType='dijit.form.Button' onClick='applyChanges()'>Apply Changes</button>
+    <button data-dojo-type='dijit.form.Button' onClick='applyChanges()'>Apply Changes</button>
     <span>To move an item, drag it up or down with the mouse.</span>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <ol id='acl-ol'></ol>
 </div>
 
 <div class='hidden'>
-    <div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div>
+    <div data-dojo-type='openils.widget.ProgressDialog' data-dojo-id='progressDialog'></div>
 </div>
 
 [% END %]
diff --git a/Open-ILS/src/templates/conify/global/asset/copy_template.tt2 b/Open-ILS/src/templates/conify/global/asset/copy_template.tt2
index 495df049f5..b6a72cb086 100644
--- a/Open-ILS/src/templates/conify/global/asset/copy_template.tt2
+++ b/Open-ILS/src/templates/conify/global/asset/copy_template.tt2
@@ -1,27 +1,27 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = "Copy Templates" %]
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/conify/global/asset/copy_template.js"> </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
         <div>Copy Templates</div>
         <div>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="actGrid.showCreatePane()">New Copy Template</button>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="actGrid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
     <div class="oils-acq-basic-roomy">
         <span>Show templates available at or above</span>
         <select
-            dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId="actOwnerSelect"
+            data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id="actOwnerSelect"
             searchAttr="shortname" labelAttr="shortname">
         </select>
     </div>
-    <table jsId="actGrid"
-        dojoType="openils.widget.AutoGrid"
+    <table data-dojo-id="actGrid"
+        data-dojo-type="openils.widget.AutoGrid"
         fieldOrder="['name','owning_lib','circulate','holdable','opac_visible','loan_duration','fine_level','location','circ_modifier','floating','deposit','ref','mint_condition']"
         suppressFields="['creator','editor','edit_date','create_date','circ_lib']"
         suppressEditFields="['creator','editor','edit_date','create_date','circ_lib']"
@@ -35,14 +35,14 @@
     </table>
     <div class="hidden">
         <!-- these FilteringSelects will be attached manually to actGrid -->
-        <select required="false" dojoType="dijit.form.FilteringSelect"
-            jsId="special_fine_level">
+        <select required="false" data-dojo-type="dijit.form.FilteringSelect"
+            data-dojo-id="special_fine_level">
             <option value="1">Low</option>
             <option value="2">Normal</option>
             <option value="3">High</option>
         </select>
-        <select required="false" dojoType="dijit.form.FilteringSelect"
-            jsId="special_loan_duration">
+        <select required="false" data-dojo-type="dijit.form.FilteringSelect"
+            data-dojo-id="special_loan_duration">
             <option value="1">Short</option>
             <option value="2">Normal</option>
             <option value="3">Long</option>
diff --git a/Open-ILS/src/templates/conify/global/biblio/monograph_part.tt2 b/Open-ILS/src/templates/conify/global/biblio/monograph_part.tt2
index 08fc5c04ce..5dc9d93874 100644
--- a/Open-ILS/src/templates/conify/global/biblio/monograph_part.tt2
+++ b/Open-ILS/src/templates/conify/global/biblio/monograph_part.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Configure Monograph Parts' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Monograph Parts</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='monoPartGrid.showCreateDialog()'>New Monograph Part</button>
-            <button dojoType='dijit.form.Button' onClick='monoPartGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='monoPartGrid.showCreateDialog()'>New Monograph Part</button>
+            <button data-dojo-type='dijit.form.Button' onClick='monoPartGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="monoPartGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="monoPartGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             autoHeight='true'
             fieldOrder="['label']"
             suppressFields="['id','record','label_sortkey']"
diff --git a/Open-ILS/src/templates/conify/global/booking/resource.tt2 b/Open-ILS/src/templates/conify/global/booking/resource.tt2
index bb5158320e..4603cc6b26 100644
--- a/Open-ILS/src/templates/conify/global/booking/resource.tt2
+++ b/Open-ILS/src/templates/conify/global/booking/resource.tt2
@@ -1,23 +1,23 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Resources' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
     <div>Resources</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='brsrcGrid.showCreateDialog()'>New Resource</button>
-        <button dojoType='dijit.form.Button' onClick='brsrcGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='brsrcGrid.showCreateDialog()'>New Resource</button>
+        <button data-dojo-type='dijit.form.Button' onClick='brsrcGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <span>Context Org Unit</span>
-    <select dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId='contextOrgSelector'
+    <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id='contextOrgSelector'
             searchAttr='shortname'
             labelAttr='shortname'>
     </select>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="brsrcGrid"
-            dojoType="openils.widget.AutoGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="brsrcGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['owner', 'type', 'barcode',
                 'overbook', 'deposit', 'deposit_amount', 'user_fee']"
             query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/booking/resource_attr.tt2 b/Open-ILS/src/templates/conify/global/booking/resource_attr.tt2
index d3ef1c43a4..97aa68515e 100644
--- a/Open-ILS/src/templates/conify/global/booking/resource_attr.tt2
+++ b/Open-ILS/src/templates/conify/global/booking/resource_attr.tt2
@@ -1,23 +1,23 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Resource Attributes' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
     <div>Resource Attributes</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='braGrid.showCreateDialog()'>New Resource Attribute</button>
-        <button dojoType='dijit.form.Button' onClick='braGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='braGrid.showCreateDialog()'>New Resource Attribute</button>
+        <button data-dojo-type='dijit.form.Button' onClick='braGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <span>Context Org Unit</span>
-    <select dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId='contextOrgSelector'
+    <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id='contextOrgSelector'
             searchAttr='shortname'
             labelAttr='shortname'>
     </select>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="braGrid"
-            dojoType="openils.widget.AutoGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="braGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'owner', 'resource_type', 'required']"
             query="{id: '*'}"
             fmClass='bra'
diff --git a/Open-ILS/src/templates/conify/global/booking/resource_attr_map.tt2 b/Open-ILS/src/templates/conify/global/booking/resource_attr_map.tt2
index 9943afc03d..a6fea3e686 100644
--- a/Open-ILS/src/templates/conify/global/booking/resource_attr_map.tt2
+++ b/Open-ILS/src/templates/conify/global/booking/resource_attr_map.tt2
@@ -1,23 +1,23 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Resource Attribute Maps' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
     <div>Resource Attribute Maps</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='bramGrid.showCreateDialog()'>New Resource Attribute Map</button>
-        <button dojoType='dijit.form.Button' onClick='bramGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='bramGrid.showCreateDialog()'>New Resource Attribute Map</button>
+        <button data-dojo-type='dijit.form.Button' onClick='bramGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <span>Context Org Unit</span>
-    <select dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId='contextOrgSelector'
+    <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id='contextOrgSelector'
             searchAttr='shortname'
             labelAttr='shortname'>
     </select>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="bramGrid"
-            dojoType="openils.widget.AutoGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="bramGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['resource', 'resource_attr', 'value']"
             query="{id: '*'}"
             fmClass='bram'
diff --git a/Open-ILS/src/templates/conify/global/booking/resource_attr_value.tt2 b/Open-ILS/src/templates/conify/global/booking/resource_attr_value.tt2
index 61c45198a8..dcf905d773 100644
--- a/Open-ILS/src/templates/conify/global/booking/resource_attr_value.tt2
+++ b/Open-ILS/src/templates/conify/global/booking/resource_attr_value.tt2
@@ -1,23 +1,23 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Resource Attribute Values' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
     <div>Resource Attribute Values</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='bravGrid.showCreateDialog()'>New Resource Attribute Value</button>
-        <button dojoType='dijit.form.Button' onClick='bravGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='bravGrid.showCreateDialog()'>New Resource Attribute Value</button>
+        <button data-dojo-type='dijit.form.Button' onClick='bravGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <span>Context Org Unit</span>
-    <select dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId='contextOrgSelector'
+    <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id='contextOrgSelector'
             searchAttr='shortname'
             labelAttr='shortname'>
     </select>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="bravGrid"
-            dojoType="openils.widget.AutoGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="bravGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['owner', 'attr', 'valid_value']"
             query="{id: '*'}"
             fmClass='brav'
diff --git a/Open-ILS/src/templates/conify/global/booking/resource_type.tt2 b/Open-ILS/src/templates/conify/global/booking/resource_type.tt2
index 3783aa2d77..7e3444d846 100644
--- a/Open-ILS/src/templates/conify/global/booking/resource_type.tt2
+++ b/Open-ILS/src/templates/conify/global/booking/resource_type.tt2
@@ -1,23 +1,23 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Resource Types' %]
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
         <div>Resource Types</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='brtGrid.showCreateDialog()'>New Resource Type</button>
-            <button dojoType='dijit.form.Button' onClick='brtGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='brtGrid.showCreateDialog()'>New Resource Type</button>
+            <button data-dojo-type='dijit.form.Button' onClick='brtGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <span>Context Org Unit</span>
-    <select dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId='contextOrgSelector'
+    <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id='contextOrgSelector'
             searchAttr='shortname'
             labelAttr='shortname'>
     </select>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="brtGrid"
-            dojoType="openils.widget.AutoGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="brtGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'fine_interval', 'fine_amount',
                 'owner', 'catalog_item', 'transferable']"
             suppressFields="['record']"
diff --git a/Open-ILS/src/templates/conify/global/cat/authority/browse_axis.tt2 b/Open-ILS/src/templates/conify/global/cat/authority/browse_axis.tt2
index 4594158aea..ed51ab497b 100644
--- a/Open-ILS/src/templates/conify/global/cat/authority/browse_axis.tt2
+++ b/Open-ILS/src/templates/conify/global/cat/authority/browse_axis.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = "Configure Authority Browse Axes" %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
         <div>Browse Axes</div>
         <div>
-            <button dojoType="dijit.form.Button" onClick="aba_grid.showCreateDialog()">New Browse Axis</button>
-            <button dojoType="dijit.form.Button" onClick="aba_grid.deleteSelected()">Delete Selected</button>
+            <button data-dojo-type="dijit.form.Button" onClick="aba_grid.showCreateDialog()">New Browse Axis</button>
+            <button data-dojo-type="dijit.form.Button" onClick="aba_grid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
     <div>
-        <table  jsId="aba_grid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="aba_grid"
+                data-dojo-type="openils.widget.AutoGrid"
                 autoHeight="true"
                 defaultCellWidth="'auto'"
                 fieldOrder="['code','name','description','sorter']"
diff --git a/Open-ILS/src/templates/conify/global/cat/authority/browse_axis_authority_field_map.tt2 b/Open-ILS/src/templates/conify/global/cat/authority/browse_axis_authority_field_map.tt2
index c80403cea1..e3de4a6086 100644
--- a/Open-ILS/src/templates/conify/global/cat/authority/browse_axis_authority_field_map.tt2
+++ b/Open-ILS/src/templates/conify/global/cat/authority/browse_axis_authority_field_map.tt2
@@ -1,11 +1,11 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = "Configure Browse Axis-Authority Field Maps" %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
         <div>Browse Axis-Authority Field Maps</div>
         <div>
-            <button dojoType="dijit.form.Button" onClick="abaafm_grid.showCreateDialog()">New Browse Axis-Authority Field Map</button>
-            <button dojoType="dijit.form.Button" onClick="abaafm_grid.deleteSelected()">Delete Selected</button>
+            <button data-dojo-type="dijit.form.Button" onClick="abaafm_grid.showCreateDialog()">New Browse Axis-Authority Field Map</button>
+            <button data-dojo-type="dijit.form.Button" onClick="abaafm_grid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
     <div id="authority-field-metadata-holder" class="hidden">
@@ -13,8 +13,8 @@
         <a id="authority-field-metadata"></a>
     </div>
     <div>
-        <table  jsId="abaafm_grid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="abaafm_grid"
+                data-dojo-type="openils.widget.AutoGrid"
                 autoHeight="true"
                 defaultCellWidth="'auto'"
                 suppressEditFields="['id']"
diff --git a/Open-ILS/src/templates/conify/global/cat/authority/control_set.tt2 b/Open-ILS/src/templates/conify/global/cat/authority/control_set.tt2
index 48bb17662c..f404e35fa0 100644
--- a/Open-ILS/src/templates/conify/global/cat/authority/control_set.tt2
+++ b/Open-ILS/src/templates/conify/global/cat/authority/control_set.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = "Configure Authority Control Sets" %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
         <div>Control Sets</div>
         <div>
-            <button dojoType="dijit.form.Button" onClick="acs_grid.showCreateDialog()">New Control Set</button>
-            <button dojoType="dijit.form.Button" onClick="acs_grid.deleteSelected()">Delete Selected</button>
+            <button data-dojo-type="dijit.form.Button" onClick="acs_grid.showCreateDialog()">New Control Set</button>
+            <button data-dojo-type="dijit.form.Button" onClick="acs_grid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="acs_grid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="acs_grid"
+            data-dojo-type="openils.widget.AutoGrid"
             autoHeight="true"
             defaultCellWidth="'auto'"
             fieldOrder="['name','description','id']"
diff --git a/Open-ILS/src/templates/conify/global/cat/authority/control_set_authority_field.tt2 b/Open-ILS/src/templates/conify/global/cat/authority/control_set_authority_field.tt2
index ca873da150..0853433218 100644
--- a/Open-ILS/src/templates/conify/global/cat/authority/control_set_authority_field.tt2
+++ b/Open-ILS/src/templates/conify/global/cat/authority/control_set_authority_field.tt2
@@ -1,11 +1,11 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = "Configure Authority Authority Fields" %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
         <div>Authority Fields</div>
         <div>
-            <button dojoType="dijit.form.Button" onClick="acsaf_grid.showCreateDialog()">New Authority Field</button>
-            <button dojoType="dijit.form.Button" onClick="acsaf_grid.deleteSelected()">Delete Selected</button>
+            <button data-dojo-type="dijit.form.Button" onClick="acsaf_grid.showCreateDialog()">New Authority Field</button>
+            <button data-dojo-type="dijit.form.Button" onClick="acsaf_grid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
     <div id="control-set-metadata-holder" class="hidden">
@@ -13,8 +13,8 @@
         <a id="control-set-metadata"></a>
     </div>
     <div>
-        <table  jsId="acsaf_grid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="acsaf_grid"
+                data-dojo-type="openils.widget.AutoGrid"
                 autoHeight="true"
                 defaultCellWidth="'12%'"
                 fieldOrder="['id','name','description','main_entry','control_set','tag','sf_list','bib_fields','axis_maps']"
diff --git a/Open-ILS/src/templates/conify/global/cat/authority/control_set_bib_field.tt2 b/Open-ILS/src/templates/conify/global/cat/authority/control_set_bib_field.tt2
index 5c2714a72b..560d6efab1 100644
--- a/Open-ILS/src/templates/conify/global/cat/authority/control_set_bib_field.tt2
+++ b/Open-ILS/src/templates/conify/global/cat/authority/control_set_bib_field.tt2
@@ -1,11 +1,11 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = "Configure Authority Control Set Bib Fields" %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
         <div>Control Set Bib Fields</div>
         <div>
-            <button dojoType="dijit.form.Button" onClick="acsbf_grid.showCreateDialog()">New Control Set Bib Field</button>
-            <button dojoType="dijit.form.Button" onClick="acsbf_grid.deleteSelected()">Delete Selected</button>
+            <button data-dojo-type="dijit.form.Button" onClick="acsbf_grid.showCreateDialog()">New Control Set Bib Field</button>
+            <button data-dojo-type="dijit.form.Button" onClick="acsbf_grid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
     <div id="authority-field-metadata-holder" class="hidden">
@@ -13,8 +13,8 @@
         <a id="authority-field-metadata"></a>
     </div>
     <div>
-        <table  jsId="acsbf_grid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="acsbf_grid"
+                data-dojo-type="openils.widget.AutoGrid"
                 autoHeight="true"
                 defaultCellWidth="'auto'"
                 suppressEditFields="['id']"
diff --git a/Open-ILS/src/templates/conify/global/cat/authority/thesaurus.tt2 b/Open-ILS/src/templates/conify/global/cat/authority/thesaurus.tt2
index 29c42a080c..aacb1a471f 100644
--- a/Open-ILS/src/templates/conify/global/cat/authority/thesaurus.tt2
+++ b/Open-ILS/src/templates/conify/global/cat/authority/thesaurus.tt2
@@ -1,11 +1,11 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = "Configure Authority Thesauri" %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
         <div>Thesauri</div>
         <div>
-            <button dojoType="dijit.form.Button" onClick="at_grid.showCreateDialog()">New Thesaurus</button>
-            <button dojoType="dijit.form.Button" onClick="at_grid.deleteSelected()">Delete Selected</button>
+            <button data-dojo-type="dijit.form.Button" onClick="at_grid.showCreateDialog()">New Thesaurus</button>
+            <button data-dojo-type="dijit.form.Button" onClick="at_grid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
     <div id="control-set-metadata-holder" class="hidden">
@@ -13,8 +13,8 @@
         <a id="control-set-metadata"></a>
     </div>
     <div>
-        <table  jsId="at_grid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="at_grid"
+                data-dojo-type="openils.widget.AutoGrid"
                 autoHeight="true"
                 defaultCellWidth="'auto'"
                 fieldOrder="['code','control_set','name','description']"
diff --git a/Open-ILS/src/templates/conify/global/config/acn_prefix.tt2 b/Open-ILS/src/templates/conify/global/config/acn_prefix.tt2
index abe096d4d4..22c93ab4a8 100644
--- a/Open-ILS/src/templates/conify/global/config/acn_prefix.tt2
+++ b/Open-ILS/src/templates/conify/global/config/acn_prefix.tt2
@@ -4,21 +4,21 @@
 
 <!-- grid -->
 
- <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Call Number Prefixes</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='thingGrid.showCreateDialog()'>New Prefix</button>
-                <button dojoType='dijit.form.Button' onClick='thingGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='thingGrid.showCreateDialog()'>New Prefix</button>
+                <button data-dojo-type='dijit.form.Button' onClick='thingGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
         <div>
             <span>Context Org Unit</span>
-            <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='thingContextOrgSelect'
+            <select data-dojo-type="openils.widget.OrgUnitFilteringSelect" data-dojo-id='thingContextOrgSelect'
                 searchAttr='shortname' labelAttr='shortname'> </select>
         </div>
-        <table  jsId="thingGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="thingGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 fieldOrder="['id', 'label', 'owning_lib']"
                 suppressFields="['label_sortkey']"
                 suppressEditFields="['label_sortkey']"
diff --git a/Open-ILS/src/templates/conify/global/config/acn_suffix.tt2 b/Open-ILS/src/templates/conify/global/config/acn_suffix.tt2
index 70f0a5c78f..a81b356d7f 100644
--- a/Open-ILS/src/templates/conify/global/config/acn_suffix.tt2
+++ b/Open-ILS/src/templates/conify/global/config/acn_suffix.tt2
@@ -4,21 +4,21 @@
 
 <!-- grid -->
 
- <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Call Number Suffixes</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='thingGrid.showCreateDialog()'>New Suffix</button>
-                <button dojoType='dijit.form.Button' onClick='thingGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='thingGrid.showCreateDialog()'>New Suffix</button>
+                <button data-dojo-type='dijit.form.Button' onClick='thingGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
         <div>
             <span>Context Org Unit</span>
-            <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='thingContextOrgSelect'
+            <select data-dojo-type="openils.widget.OrgUnitFilteringSelect" data-dojo-id='thingContextOrgSelect'
                 searchAttr='shortname' labelAttr='shortname'> </select>
         </div>
-        <table  jsId="thingGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="thingGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 fieldOrder="['id', 'label', 'owning_lib']"
                 suppressFields="['label_sortkey']"
                 suppressEditFields="['label_sortkey']"
diff --git a/Open-ILS/src/templates/conify/global/config/actor_sip_fields.tt2 b/Open-ILS/src/templates/conify/global/config/actor_sip_fields.tt2
index ee28617779..901927183b 100644
--- a/Open-ILS/src/templates/conify/global/config/actor_sip_fields.tt2
+++ b/Open-ILS/src/templates/conify/global/config/actor_sip_fields.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Actor Stat Cat Sip Fields' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Actor Stat Cat Sip Fields</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='actorSipFieldsGrid.showCreateDialog()'>New Sip Field</button>
-            <button dojoType='dijit.form.Button' onClick='actorSipFieldsGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='actorSipFieldsGrid.showCreateDialog()'>New Sip Field</button>
+            <button data-dojo-type='dijit.form.Button' onClick='actorSipFieldsGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="actorSipFieldsGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="actorSipFieldsGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['field', 'name', 'one_only']"
             query="{field: '*'}"
             fmClass='actscsf'
diff --git a/Open-ILS/src/templates/conify/global/config/asset_sip_fields.tt2 b/Open-ILS/src/templates/conify/global/config/asset_sip_fields.tt2
index 1e51a8159a..507580dfcd 100644
--- a/Open-ILS/src/templates/conify/global/config/asset_sip_fields.tt2
+++ b/Open-ILS/src/templates/conify/global/config/asset_sip_fields.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Asset Stat Cat Sip Fields' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Asset Stat Cat Sip Fields</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='assetSipFieldsGrid.showCreateDialog()'>New Sip Field</button>
-            <button dojoType='dijit.form.Button' onClick='assetSipFieldsGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='assetSipFieldsGrid.showCreateDialog()'>New Sip Field</button>
+            <button data-dojo-type='dijit.form.Button' onClick='assetSipFieldsGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="assetSipFieldsGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="assetSipFieldsGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['field', 'name', 'one_only']"
             query="{field: '*'}"
             fmClass='ascsf'
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 593d5780b3..10f084afe7 100644
--- a/Open-ILS/src/templates/conify/global/config/barcode_completion.tt2
+++ b/Open-ILS/src/templates/conify/global/config/barcode_completion.tt2
@@ -1,14 +1,14 @@
 [% ctx.page_title = 'Barcode Completion Configuration' %]
 [% WRAPPER base.tt2 %]
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/config/barcode_completion.js'> </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
     <div>Barcode Completion Configuration</div>
-    <div><button dojoType='dijit.form.Button' onClick='cmGrid.showCreatePane()'>New</button></div>
+    <div><button data-dojo-type='dijit.form.Button' onClick='cmGrid.showCreatePane()'>New</button></div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="cmGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="cmGrid"
             style="height: 600px;"
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['id', 'active', 'org_unit', 'prefix', 'suffix', 'length', 'padding', 'padding_end', 'asset', 'actor']"
             defaultCellWidth='"auto"'
             query="{id: '*'}"
@@ -20,7 +20,7 @@
     </table>
 </div>
 
-<div class='hidden'><div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div></div>
+<div class='hidden'><div data-dojo-type='openils.widget.ProgressDialog' data-dojo-id='progressDialog'></div></div>
 
 [% END %]
 
diff --git a/Open-ILS/src/templates/conify/global/config/billing_type.tt2 b/Open-ILS/src/templates/conify/global/config/billing_type.tt2
index 95de4e4334..072056ddb5 100644
--- a/Open-ILS/src/templates/conify/global/config/billing_type.tt2
+++ b/Open-ILS/src/templates/conify/global/config/billing_type.tt2
@@ -4,21 +4,21 @@
 
 <!-- grid -->
 
- <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Billing Types</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='btGrid.showCreateDialog()'>New Billing Type</button>
-                <button dojoType='dijit.form.Button' onClick='btGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='btGrid.showCreateDialog()'>New Billing Type</button>
+                <button data-dojo-type='dijit.form.Button' onClick='btGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
         <div>
             <span>Context Org Unit</span>
-            <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='btContextOrgSelect'
+            <select data-dojo-type="openils.widget.OrgUnitFilteringSelect" data-dojo-id='btContextOrgSelect'
                 searchAttr='shortname' labelAttr='shortname'> </select>
         </div>
-        <table  jsId="btGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="btGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 fieldOrder="['id', 'name', 'owner', 'default_price']"
                 query="{id: '*'}"
                 defaultCellWidth='20'
diff --git a/Open-ILS/src/templates/conify/global/config/circ_limit_group.tt2 b/Open-ILS/src/templates/conify/global/config/circ_limit_group.tt2
index 4f36e9ce2a..8cbc70ce59 100644
--- a/Open-ILS/src/templates/conify/global/config/circ_limit_group.tt2
+++ b/Open-ILS/src/templates/conify/global/config/circ_limit_group.tt2
@@ -1,17 +1,17 @@
 [% WRAPPER base.tt2 %]
 <h1>Circulation Limit Group</h1> <br/>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
     <div>Circulation Limit Group</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='clgGrid.showCreateDialog()'>New Limit Group</button>
-        <button dojoType='dijit.form.Button' onClick='clgGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='clgGrid.showCreateDialog()'>New Limit Group</button>
+        <button data-dojo-type='dijit.form.Button' onClick='clgGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="clgGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="clgGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['id','name','description']"
             query="{id: '*'}"
             defaultCellWidth='"auto"'
diff --git a/Open-ILS/src/templates/conify/global/config/circ_limit_set.tt2 b/Open-ILS/src/templates/conify/global/config/circ_limit_set.tt2
index 9f9b90fa20..79e5802e47 100644
--- a/Open-ILS/src/templates/conify/global/config/circ_limit_set.tt2
+++ b/Open-ILS/src/templates/conify/global/config/circ_limit_set.tt2
@@ -1,17 +1,17 @@
 [% ctx.page_title = 'Circulation Limit Set' %]
 [% WRAPPER base.tt2 %]
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/config/circ_limit_set.js'> </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
     <div>Circulation Limit Set</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='clsGrid.showCreatePane()'>New</button>
-        <button dojoType='dijit.form.Button' onClick='clsGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='clsGrid.showCreatePane()'>New</button>
+        <button data-dojo-type='dijit.form.Button' onClick='clsGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="clsGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="clsGrid"
             style="height: 600px;"
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['id', 'owning_lib', 'name', 'items_out', 'depth', 'global', 'description']"
             defaultCellWidth='"auto"'
             query="{id: '*'}"
@@ -73,6 +73,6 @@
     </div>
 </div>
 
-<div class='hidden'><div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div></div>
+<div class='hidden'><div data-dojo-type='openils.widget.ProgressDialog' data-dojo-id='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 6bdfced4ab..90796020c0 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
@@ -1,14 +1,14 @@
 [% ctx.page_title = 'Circulation Policy Configuration' %]
 [% WRAPPER base.tt2 %]
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/config/circ_matrix_matchpoint.js'> </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
     <div>Circulation Policy Configuration</div>
-    <div><button dojoType='dijit.form.Button' onClick='cmGrid.showCreatePane()'>New</button></div>
+    <div><button data-dojo-type='dijit.form.Button' onClick='cmGrid.showCreatePane()'>New</button></div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="cmGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="cmGrid"
             style="height: 600px;"
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['id', 'active', 'grp', 'org_unit', 'copy_circ_lib', 'copy_owning_lib', 'user_home_ou', 'is_renewal', 'juvenile_flag', 'circ_modifier', 'marc_type', 'marc_form', 'marc_bib_level', 'marc_vr_format', 'ref_flag', 'usr_age_lower_bound', 'usr_age_upper_bound', 'item_age', 'circulate', 'duration_rule', 'renewals', 'hard_due_date', 'recurring_fine_rule', 'grace_period', 'max_fine_rule', 'available_copy_hold_ratio', 'total_copy_hold_ratio', 'script_test']"
             defaultCellWidth='"auto"'
             query="{id: '*'}"
@@ -57,7 +57,7 @@
 </div>
 
 
-<div class='hidden'><div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div></div>
+<div class='hidden'><div data-dojo-type='openils.widget.ProgressDialog' data-dojo-id='progressDialog'></div></div>
 
 [% END %]
 
diff --git a/Open-ILS/src/templates/conify/global/config/circ_matrix_weights.tt2 b/Open-ILS/src/templates/conify/global/config/circ_matrix_weights.tt2
index 0b1893587c..0c13785fb4 100644
--- a/Open-ILS/src/templates/conify/global/config/circ_matrix_weights.tt2
+++ b/Open-ILS/src/templates/conify/global/config/circ_matrix_weights.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Circ Matrix Weights' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Circ Matrix Weights</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='ruleCircWeightsGrid.showCreateDialog()'>New Weight Set</button>
-            <button dojoType='dijit.form.Button' onClick='ruleCircWeightsGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleCircWeightsGrid.showCreateDialog()'>New Weight Set</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleCircWeightsGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="ruleCircWeightsGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="ruleCircWeightsGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name']"
             suppressFields="['id']"
             query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/config/circ_modifier.tt2 b/Open-ILS/src/templates/conify/global/config/circ_modifier.tt2
index 36b3a2cbdb..b94c647e18 100644
--- a/Open-ILS/src/templates/conify/global/config/circ_modifier.tt2
+++ b/Open-ILS/src/templates/conify/global/config/circ_modifier.tt2
@@ -2,7 +2,7 @@
 <h1>Circulation Modifier</h1> <br/>
 
 <div class='hidden'>
-    <select dojoType="dijit.form.FilteringSelect" jsId="sip2Selector">
+    <select data-dojo-type="dijit.form.FilteringSelect" data-dojo-id="sip2Selector">
         <option value='000'>Other</option>
         <option value='001' selected='selected'>Book</option>
         <option value='002'>Magazine</option>
@@ -17,18 +17,18 @@
     </select>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
     <div>Circulation Modifier</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='cmGrid.showCreateDialog()'>New Circ Modifier</button>
-        <button dojoType='dijit.form.Button' onClick='cmGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='cmGrid.showCreateDialog()'>New Circ Modifier</button>
+        <button data-dojo-type='dijit.form.Button' onClick='cmGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="cmGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="cmGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['code', 'name', 'description', 'sip2_media_type', 'magnetic_media']"
             query="{name: '*'}"
             defaultCellWidth='"auto"'
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 735436828d..00e11bd081 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
@@ -1,22 +1,22 @@
 [% WRAPPER base.tt2 %]
 <h1>Coded Value Maps</h1> <br/>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
     <div>Coded Value Maps</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='ccvmGrid.showCreateDialog()'>New Map</button>
-        <button dojoType='dijit.form.Button' onClick='ccvmGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='ccvmGrid.showCreateDialog()'>New Map</button>
+        <button data-dojo-type='dijit.form.Button' onClick='ccvmGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <span>Record Attribute Type: </span><div id='attr-def-div'></div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="ccvmGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="ccvmGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['ctype', 'code', 'value', 'description', 'opac_visible', 'search_label']"
             query="{code: '*'}"
             defaultCellWidth='"25%"'
diff --git a/Open-ILS/src/templates/conify/global/config/global_flag.tt2 b/Open-ILS/src/templates/conify/global/config/global_flag.tt2
index 2aa5fe7740..82b897796f 100644
--- a/Open-ILS/src/templates/conify/global/config/global_flag.tt2
+++ b/Open-ILS/src/templates/conify/global/config/global_flag.tt2
@@ -1,13 +1,13 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Global Flags' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Global Flags</div>
         <div></div>
     </div>
     <div>
-    <table  jsId="gfGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="gfGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'label', 'enabled', 'value']"
             suppressFields="['name']"
             query="{name: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/config/hard_due_date.tt2 b/Open-ILS/src/templates/conify/global/config/hard_due_date.tt2
index 7a1da16796..5d6873752f 100644
--- a/Open-ILS/src/templates/conify/global/config/hard_due_date.tt2
+++ b/Open-ILS/src/templates/conify/global/config/hard_due_date.tt2
@@ -40,16 +40,16 @@
         }
     );
 </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
         layoutAlign="top" class="oils-header-panel">
         <div>Hard Due Dates</div>
         <div>
             <button
-                dojoType="dijit.form.Button"
+                data-dojo-type="dijit.form.Button"
                 onClick="chddGrid.showCreateDialog();">New Hard Due Date</button>
             <button
-                dojoType="dijit.form.Button"
+                data-dojo-type="dijit.form.Button"
                 onClick="chddGrid.deleteSelected();">Deleted Selected</button>
         </div>
     </div>
@@ -59,8 +59,8 @@
         ]
     </div>
     <div>
-        <table jsId="chddGrid"
-            dojoType="openils.widget.AutoGrid"
+        <table data-dojo-id="chddGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             showPaginator="true"
             query="{name: '*'}"
             defaultCellWidth="'auto'"
diff --git a/Open-ILS/src/templates/conify/global/config/hard_due_date_values.tt2 b/Open-ILS/src/templates/conify/global/config/hard_due_date_values.tt2
index 08847a7c2b..89032f1b17 100644
--- a/Open-ILS/src/templates/conify/global/config/hard_due_date_values.tt2
+++ b/Open-ILS/src/templates/conify/global/config/hard_due_date_values.tt2
@@ -37,16 +37,16 @@
         }
     );
 </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
         layoutAlign="top" class="oils-header-panel">
         <div>Hard Due Date Values</div>
         <div>
             <button
-                dojoType="dijit.form.Button"
+                data-dojo-type="dijit.form.Button"
                 onClick="chddvGrid.showCreateDialog();">New Hard Due Date Value</button>
             <button
-                dojoType="dijit.form.Button"
+                data-dojo-type="dijit.form.Button"
                 onClick="chddvGrid.deleteSelected();">Deleted Selected</button>
         </div>
     </div>
@@ -56,8 +56,8 @@
         <a href="javascript:void(0);" id="linked_chdd_link"></a>)
     </div>
     <div>
-        <table jsId="chddvGrid"
-            dojoType="openils.widget.AutoGrid"
+        <table data-dojo-id="chddvGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             showPaginator="true"
             query="{name: '*'}"
             defaultCellWidth="'auto'"
diff --git a/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2 b/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2
index def6292861..36e74fc10d 100644
--- a/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2
+++ b/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2
@@ -1,13 +1,13 @@
 [% ctx.page_title = 'Hold Policy Configuration' %]
 [% WRAPPER base.tt2 %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
     <div>Hold Policy Configuration</div>
-    <div><button dojoType='dijit.form.Button' onClick='hmGrid.showCreatePane()'>New</button></div>
+    <div><button data-dojo-type='dijit.form.Button' onClick='hmGrid.showCreatePane()'>New</button></div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="hmGrid" 
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="hmGrid" 
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid" 
+            data-dojo-type="openils.widget.AutoGrid" 
             fieldOrder="['id', 'strict_ou_match', 'user_home_ou', 'request_ou', 'pickup_ou', 'item_owning_ou', 'item_circ_ou', 'requestor_grp', 'circ_modifier', 'marc_type', 'marc_form', 'marc_bib_level', 'marc_vr_format']"
             defaultCellWidth='"auto"'
             query="{id: '*'}" 
diff --git a/Open-ILS/src/templates/conify/global/config/hold_matrix_weights.tt2 b/Open-ILS/src/templates/conify/global/config/hold_matrix_weights.tt2
index 5c12e692ce..b337157cc2 100644
--- a/Open-ILS/src/templates/conify/global/config/hold_matrix_weights.tt2
+++ b/Open-ILS/src/templates/conify/global/config/hold_matrix_weights.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Hold Matrix Weights' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Hold Matrix Weights</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='ruleHoldWeightsGrid.showCreateDialog()'>New Weight Set</button>
-            <button dojoType='dijit.form.Button' onClick='ruleHoldWeightsGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleHoldWeightsGrid.showCreateDialog()'>New Weight Set</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleHoldWeightsGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="ruleHoldWeightsGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="ruleHoldWeightsGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name']"
             suppressFields="['id']"
             query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/config/idl_field_doc.tt2 b/Open-ILS/src/templates/conify/global/config/idl_field_doc.tt2
index 291c086871..5339b2401c 100644
--- a/Open-ILS/src/templates/conify/global/config/idl_field_doc.tt2
+++ b/Open-ILS/src/templates/conify/global/config/idl_field_doc.tt2
@@ -6,15 +6,15 @@
         <td align='left'><h3>Field Documentation</h3></td>
         <td align='right'>
             <span>Class:</span>
-            <span dojoType='dijit.form.FilteringSelect' jsId='fmClassSelector'></span>
-            <button dojoType='dijit.form.Button' onClick='fdocGrid.showCreateDialog()'>New</button>
+            <span data-dojo-type='dijit.form.FilteringSelect' data-dojo-id='fmClassSelector'></span>
+            <button data-dojo-type='dijit.form.Button' onClick='fdocGrid.showCreateDialog()'>New</button>
         </td>
     </tr>
 </table>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="fdocGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="fdocGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['id', 'fm_class', 'owner', 'field', 'string']"
             query="{id: '*'}"
             fmClass='fdoc'
@@ -26,7 +26,7 @@
     </table>
   </div>
 <div class='hidden'>
-    <span dojoType='dijit.form.FilteringSelect' jsId='editClassSelector'></span>
-    <span dojoType='dijit.form.FilteringSelect' jsId='editFieldSelector'></span>
+    <span data-dojo-type='dijit.form.FilteringSelect' data-dojo-id='editClassSelector'></span>
+    <span data-dojo-type='dijit.form.FilteringSelect' data-dojo-id='editFieldSelector'></span>
 </div>
 [% END %]
diff --git a/Open-ILS/src/templates/conify/global/config/metabib_field.tt2 b/Open-ILS/src/templates/conify/global/config/metabib_field.tt2
index 3de2f748c9..b7d438e6d5 100644
--- a/Open-ILS/src/templates/conify/global/config/metabib_field.tt2
+++ b/Open-ILS/src/templates/conify/global/config/metabib_field.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Metabib Field' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Metabib Field</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='mbFieldGrid.showCreateDialog()'>New Field</button>
-            <button dojoType='dijit.form.Button' onClick='mbFieldGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='mbFieldGrid.showCreateDialog()'>New Field</button>
+            <button data-dojo-type='dijit.form.Button' onClick='mbFieldGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="mbFieldGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="mbFieldGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'label', 'field_class', 'weight', 'format', 'search_field', 'facet_field', 'xpath']"
             query="{field: '*'}"
             fmClass='cmf'
diff --git a/Open-ILS/src/templates/conify/global/config/org_unit_setting_type.tt2 b/Open-ILS/src/templates/conify/global/config/org_unit_setting_type.tt2
index 970f801e67..e343cea2e9 100644
--- a/Open-ILS/src/templates/conify/global/config/org_unit_setting_type.tt2
+++ b/Open-ILS/src/templates/conify/global/config/org_unit_setting_type.tt2
@@ -2,7 +2,7 @@
 [% ctx.page_title = 'Org Unit Setting Types' %]
 
 <div class='hidden'>
-    <select dojoType="dijit.form.FilteringSelect" jsId="dTypeSelector">
+    <select data-dojo-type="dijit.form.FilteringSelect" data-dojo-id="dTypeSelector">
         <option value='string' selected='selected'>String</option>
         <option value='bool'>Boolean</option>
         <option value='integer'>Integer</option>
@@ -17,18 +17,18 @@
 </div>
 
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
     <div>Org Unit Setting Types</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='ostGrid.showCreateDialog()'>New Org Setting Type</button>
-        <button dojoType='dijit.form.Button' onClick='ostGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='ostGrid.showCreateDialog()'>New Org Setting Type</button>
+        <button data-dojo-type='dijit.form.Button' onClick='ostGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="ostGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="ostGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'label', 'datatype', 'description', 'fm_class']"
             query="{name: '*'}"
             defaultCellWidth='"auto"'
diff --git a/Open-ILS/src/templates/conify/global/config/record_attr_definition.tt2 b/Open-ILS/src/templates/conify/global/config/record_attr_definition.tt2
index 7c0a33a23d..950264da7f 100644
--- a/Open-ILS/src/templates/conify/global/config/record_attr_definition.tt2
+++ b/Open-ILS/src/templates/conify/global/config/record_attr_definition.tt2
@@ -2,18 +2,18 @@
 [% ctx.page_title = 'MARC Record Attribute Definitions' %]
 <h1>Record Attribute Definitions</h1> <br/>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
     <div>Record Attribute Definitions</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='cradGrid.showCreateDialog()'>New Attr. Definition</button>
-        <button dojoType='dijit.form.Button' onClick='cradGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='cradGrid.showCreateDialog()'>New Attr. Definition</button>
+        <button data-dojo-type='dijit.form.Button' onClick='cradGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="cradGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="cradGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'label']",
             query="{name: '*'}"
             fmClass='crad'
diff --git a/Open-ILS/src/templates/conify/global/config/rule_age_hold_protect.tt2 b/Open-ILS/src/templates/conify/global/config/rule_age_hold_protect.tt2
index ef422776f6..f7c59d01ea 100644
--- a/Open-ILS/src/templates/conify/global/config/rule_age_hold_protect.tt2
+++ b/Open-ILS/src/templates/conify/global/config/rule_age_hold_protect.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Age Hold Protect Rules' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Age Hold Protect Rules</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='ruleAgeProtectGrid.showCreateDialog()'>New Age Hold Protect Rule</button>
-            <button dojoType='dijit.form.Button' onClick='ruleAgeProtectGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleAgeProtectGrid.showCreateDialog()'>New Age Hold Protect Rule</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleAgeProtectGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="ruleAgeProtectGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="ruleAgeProtectGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'age', 'prox']"
             suppressFields="['id']"
             query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/config/rule_circ_duration.tt2 b/Open-ILS/src/templates/conify/global/config/rule_circ_duration.tt2
index 1ba7b232b3..1b31d422be 100644
--- a/Open-ILS/src/templates/conify/global/config/rule_circ_duration.tt2
+++ b/Open-ILS/src/templates/conify/global/config/rule_circ_duration.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Circ Duration Rules' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Circ Duration Rules</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='ruleCircDurationGrid.showCreateDialog()'>New Duration Rule</button>
-            <button dojoType='dijit.form.Button' onClick='ruleCircDurationGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleCircDurationGrid.showCreateDialog()'>New Duration Rule</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleCircDurationGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="ruleCircDurationGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="ruleCircDurationGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'max_renewals', 'shrt', 'normal', 'extended']"
             suppressFields="['id']"
             query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/config/rule_max_fine.tt2 b/Open-ILS/src/templates/conify/global/config/rule_max_fine.tt2
index 721649bcca..d7b6ff9268 100644
--- a/Open-ILS/src/templates/conify/global/config/rule_max_fine.tt2
+++ b/Open-ILS/src/templates/conify/global/config/rule_max_fine.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Circ Max Fine Rules' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Circ Max Fine Rules</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='ruleMaxFineGrid.showCreateDialog()'>New Max Fine Rule</button>
-            <button dojoType='dijit.form.Button' onClick='ruleMaxFineGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleMaxFineGrid.showCreateDialog()'>New Max Fine Rule</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleMaxFineGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="ruleMaxFineGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="ruleMaxFineGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'amount', 'is_percent']"
             suppressFields="['id']"
             query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/config/rule_recurring_fine.tt2 b/Open-ILS/src/templates/conify/global/config/rule_recurring_fine.tt2
index 60edd142aa..a08ebfc134 100644
--- a/Open-ILS/src/templates/conify/global/config/rule_recurring_fine.tt2
+++ b/Open-ILS/src/templates/conify/global/config/rule_recurring_fine.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Recurring Fine Rules' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Recurring Fine Rules</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='ruleRecurringFineGrid.showCreateDialog()'>New Recurring Fine Rule</button>
-            <button dojoType='dijit.form.Button' onClick='ruleRecurringFineGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleRecurringFineGrid.showCreateDialog()'>New Recurring Fine Rule</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleRecurringFineGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="ruleRecurringFineGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="ruleRecurringFineGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'recurrence_interval', 'low', 'normal', 'high', 'grace_period']"
             suppressFields="['id']"
             query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/config/sms_carrier.tt2 b/Open-ILS/src/templates/conify/global/config/sms_carrier.tt2
index ce5d3d94c1..67683ec68e 100644
--- a/Open-ILS/src/templates/conify/global/config/sms_carrier.tt2
+++ b/Open-ILS/src/templates/conify/global/config/sms_carrier.tt2
@@ -4,16 +4,16 @@
 
 <!-- grid -->
 
- <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>SMS Carriers</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='thingGrid.showCreateDialog()'>New Carrier</button>
-                <button dojoType='dijit.form.Button' onClick='thingGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='thingGrid.showCreateDialog()'>New Carrier</button>
+                <button data-dojo-type='dijit.form.Button' onClick='thingGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
-        <table  jsId="thingGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="thingGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 fieldOrder="['id', 'region', 'name', 'email_gateway', 'active']"
                 query="{id: '*'}"
                 defaultCellWidth='20'
diff --git a/Open-ILS/src/templates/conify/global/config/standing_penalty.tt2 b/Open-ILS/src/templates/conify/global/config/standing_penalty.tt2
index 0e8e165a40..47319b6937 100644
--- a/Open-ILS/src/templates/conify/global/config/standing_penalty.tt2
+++ b/Open-ILS/src/templates/conify/global/config/standing_penalty.tt2
@@ -4,17 +4,17 @@
 </style>
 <h1>Standing Penalty Types</h1><br/>
 
-  <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+  <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+        <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
             <div>Standing Penalty Types</div>
             <div>
-                <button dojoType='dijit.form.Button' onClick='spGrid.showCreateDialog()'>New Penalty Type</button>
-                <button dojoType='dijit.form.Button' onClick='spGrid.deleteSelected()'>Delete Selected</button>
+                <button data-dojo-type='dijit.form.Button' onClick='spGrid.showCreateDialog()'>New Penalty Type</button>
+                <button data-dojo-type='dijit.form.Button' onClick='spGrid.deleteSelected()'>Delete Selected</button>
             </div>
         </div>
 
-        <table  jsId="spGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="spGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 fieldOrder="['id', 'name', 'label', 'block_list']"
                 query="{name: '*'}"
                 defaultCellWidth='"auto"'
diff --git a/Open-ILS/src/templates/conify/global/config/usr_activity_type.tt2 b/Open-ILS/src/templates/conify/global/config/usr_activity_type.tt2
index 539ae31a4f..7070b66d62 100644
--- a/Open-ILS/src/templates/conify/global/config/usr_activity_type.tt2
+++ b/Open-ILS/src/templates/conify/global/config/usr_activity_type.tt2
@@ -4,16 +4,16 @@
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/config/sms_carrier.js'> </script>
 -->
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>[% ctx.page_title %]</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='thingGrid.showCreateDialog()'>[% l('New Activity Type') %]</button>
-            <button dojoType='dijit.form.Button' onClick='thingGrid.deleteSelected()'>[% l('Delete Selected') %]</button>
+            <button data-dojo-type='dijit.form.Button' onClick='thingGrid.showCreateDialog()'>[% l('New Activity Type') %]</button>
+            <button data-dojo-type='dijit.form.Button' onClick='thingGrid.deleteSelected()'>[% l('Delete Selected') %]</button>
         </div>
     </div>
-    <table  jsId="thingGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="thingGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['id', 'label', 'ewho', 'ewhat', 'ehow', 'egroup', 'enabled', 'transient']"
             query="{id: '*'}"
             defaultCellWidth='"15%"'
diff --git a/Open-ILS/src/templates/conify/global/config/usr_setting_type.tt2 b/Open-ILS/src/templates/conify/global/config/usr_setting_type.tt2
index 4c213ed088..445230fe9d 100644
--- a/Open-ILS/src/templates/conify/global/config/usr_setting_type.tt2
+++ b/Open-ILS/src/templates/conify/global/config/usr_setting_type.tt2
@@ -2,7 +2,7 @@
 [% ctx.page_title = 'User Setting Types' %]
 
 <div class='hidden'>
-    <select dojoType="dijit.form.FilteringSelect" jsId="dTypeSelector">
+    <select data-dojo-type="dijit.form.FilteringSelect" data-dojo-id="dTypeSelector">
         <option value='string' selected='selected'>String</option>
         <option value='bool'>Boolean</option>
         <option value='integer'>Integer</option>
@@ -17,18 +17,18 @@
 </div>
 
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
     <div>User Setting Types</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='ustGrid.showCreateDialog()'>New User Setting Type</button>
-        <button dojoType='dijit.form.Button' onClick='ustGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='ustGrid.showCreateDialog()'>New User Setting Type</button>
+        <button data-dojo-type='dijit.form.Button' onClick='ustGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="ustGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="ustGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'label', 'datatype', 'description', 'fm_class']"
             query="{name: '*'}"
             defaultCellWidth='"auto"'
diff --git a/Open-ILS/src/templates/conify/global/config/weight_assoc.tt2 b/Open-ILS/src/templates/conify/global/config/weight_assoc.tt2
index 9e42f9c21b..dcd01d7b82 100644
--- a/Open-ILS/src/templates/conify/global/config/weight_assoc.tt2
+++ b/Open-ILS/src/templates/conify/global/config/weight_assoc.tt2
@@ -1,16 +1,16 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Matrix Weight Associations' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Matrix Weight Associations</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='ruleWeightAssocGrid.showCreateDialog()'>New Weight Association</button>
-            <button dojoType='dijit.form.Button' onClick='ruleWeightAssocGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleWeightAssocGrid.showCreateDialog()'>New Weight Association</button>
+            <button data-dojo-type='dijit.form.Button' onClick='ruleWeightAssocGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
-    <table  jsId="ruleWeightAssocGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="ruleWeightAssocGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['active','org_unit','circ_weights','hold_weights']"
             suppressFields="['id']"
             query="{id: '*'}"
diff --git a/Open-ILS/src/templates/conify/global/config/z3950_source.tt2 b/Open-ILS/src/templates/conify/global/config/z3950_source.tt2
index cf32681bc7..39fe139011 100644
--- a/Open-ILS/src/templates/conify/global/config/z3950_source.tt2
+++ b/Open-ILS/src/templates/conify/global/config/z3950_source.tt2
@@ -2,19 +2,19 @@
 [% ctx.page_title = 'Z39.50 Servers' %]
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/config/z3950_source.js'> </script>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
 
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Z39.50 Servers</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='zsGrid.showCreateDialog()'>New Z39.50 Server</button>
-            <button dojoType='dijit.form.Button' onClick='zsGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='zsGrid.showCreateDialog()'>New Z39.50 Server</button>
+            <button data-dojo-type='dijit.form.Button' onClick='zsGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
 
-    <table  jsId="zsGrid"
+    <table  data-dojo-id="zsGrid"
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'label', 'host', 'port', 'db', 'record_format', 'transmission_format', 'auth']"
             query="{name: '*'}"
             defaultCellWidth='"auto"'
diff --git a/Open-ILS/src/templates/conify/global/permission/grp_penalty_threshold.tt2 b/Open-ILS/src/templates/conify/global/permission/grp_penalty_threshold.tt2
index 3a1e21f05c..bc57417a7a 100644
--- a/Open-ILS/src/templates/conify/global/permission/grp_penalty_threshold.tt2
+++ b/Open-ILS/src/templates/conify/global/permission/grp_penalty_threshold.tt2
@@ -1,27 +1,27 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Group Penalty Thresholds' %]
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
     <div>Penalty Threshold</div>
     <div>
-        <button dojoType='dijit.form.Button' onClick='gptGrid.showCreateDialog()'>New Penalty Threshold</button>
-        <button dojoType='dijit.form.Button' onClick='gptGrid.deleteSelected()'>Delete Selected</button>
+        <button data-dojo-type='dijit.form.Button' onClick='gptGrid.showCreateDialog()'>New Penalty Threshold</button>
+        <button data-dojo-type='dijit.form.Button' onClick='gptGrid.deleteSelected()'>Delete Selected</button>
     </div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <span>Context Org Unit</span>
-    <select dojoType="openils.widget.OrgUnitFilteringSelect" 
-            jsId='contextOrgSelector' 
+    <select data-dojo-type="openils.widget.OrgUnitFilteringSelect" 
+            data-dojo-id='contextOrgSelector' 
             searchAttr='shortname' 
             labelAttr='shortname'> 
     </select>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table  jsId="gptGrid" 
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table  data-dojo-id="gptGrid" 
             autoHeight='true'
-            dojoType="openils.widget.AutoGrid" 
+            data-dojo-type="openils.widget.AutoGrid" 
             fieldOrder="['id', 'grp', 'org_unit', 'penalty', 'threshold']"
             defaultCellWidth='15'
             query="{id: '*'}" 
diff --git a/Open-ILS/src/templates/conify/global/vandelay/match_set.tt2 b/Open-ILS/src/templates/conify/global/vandelay/match_set.tt2
index 2e36696aac..1fb1b83488 100644
--- a/Open-ILS/src/templates/conify/global/vandelay/match_set.tt2
+++ b/Open-ILS/src/templates/conify/global/vandelay/match_set.tt2
@@ -1,22 +1,22 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Vandelay Match Sets' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
         <div>[% ctx.page_title %]</div>
         <div>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="vms_grid.showCreateDialog()">New Match Set</button>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="vms_grid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
     <div>
         Show sets owned at or below:
-        <select dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId="context_org_selector"></select>
+        <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id="context_org_selector"></select>
     </div>
-    <table jsId="vms_grid"
-        dojoType="openils.widget.AutoGrid"
+    <table data-dojo-id="vms_grid"
+        data-dojo-type="openils.widget.AutoGrid"
         query="{id: '*'}"
         defaultCellWidth="'16em'"
         fmClass="vms"
@@ -34,7 +34,7 @@
     </table>
 </div>
 <div class="hidden">
-    <select dojoType="dijit.form.FilteringSelect" jsId="mtype_selector">
+    <select data-dojo-type="dijit.form.FilteringSelect" data-dojo-id="mtype_selector">
         [%# for the origin of these hard coded options, see the definition
         of vandelay.match_set.mtype in 012.schema.vandelay.sql %]
         <option value="biblio">biblio</option>
diff --git a/Open-ILS/src/templates/conify/global/vandelay/match_set_tree.tt2 b/Open-ILS/src/templates/conify/global/vandelay/match_set_tree.tt2
index 3ffa80b44b..93c8e7a517 100644
--- a/Open-ILS/src/templates/conify/global/vandelay/match_set_tree.tt2
+++ b/Open-ILS/src/templates/conify/global/vandelay/match_set_tree.tt2
@@ -133,8 +133,8 @@
     </div>
     <br style="clear: both;" />
     <table id="qnode-editor-container"></table>
-    <table jsId="vmsq_grid"
-        dojoType="openils.widget.AutoGrid"
+    <table data-dojo-id="vmsq_grid"
+        data-dojo-type="openils.widget.AutoGrid"
         query="{id: '*'}"
         defaultCellWidth="'17%'"
         fmClass="vmsq"
@@ -144,7 +144,7 @@
         editOnEnter="false">
     </table>
 </div>
-<div jsId="progress_dialog" dojoType="openils.widget.ProgressDialog"></div>
+<div data-dojo-id="progress_dialog" data-dojo-type="openils.widget.ProgressDialog"></div>
 <script type="text/javascript"
     src="[% ctx.media_prefix %]/js/ui/default/conify/global/vandelay/match_set.js"></script>
 [% END %]
diff --git a/Open-ILS/src/templates/login.tt2 b/Open-ILS/src/templates/login.tt2
index 08fc8bb9af..0f7fd3b340 100644
--- a/Open-ILS/src/templates/login.tt2
+++ b/Open-ILS/src/templates/login.tt2
@@ -1,5 +1,5 @@
 <!-- general purpose login dialog -->
-<div style='display:none;' dojoType="dijit.Dialog" jsId='oilsLoginDialog' class='oils-login-dialog'>
+<div style='display:none;' data-dojo-type="dijit.Dialog" data-dojo-id='oilsLoginDialog' class='oils-login-dialog'>
     <script type="text/javascript">dojo.require('dijit.form.TextBox');</script>
     <b>Please Login</b>
     <div class='hidden oils-notify-text' id='oils-login-failed'>Login Failed</div>
@@ -7,11 +7,11 @@
         <table>
             <tr>
                 <td>Username</td>
-                <td><input dojoType='dijit.form.TextBox' id='oils-login-username'/></td>
+                <td><input data-dojo-type='dijit.form.TextBox' id='oils-login-username'/></td>
             </tr>
             <tr>
                 <td>Password</td>
-                <td><input dojoType='dijit.form.TextBox' id='oils-login-password' type='password'/></td>
+                <td><input data-dojo-type='dijit.form.TextBox' id='oils-login-password' type='password'/></td>
             </tr>
             <tr>
                 <td>Workstation</td>
@@ -19,7 +19,7 @@
             </tr>
             <tr>
                 <td colspan='2' align='center'>
-                    <button onclick='oilsDoLogin();' dojoType='dijit.form.Button'>Login</button>
+                    <button onclick='oilsDoLogin();' data-dojo-type='dijit.form.Button'>Login</button>
                 </td>
             </tr>
         </table>
diff --git a/Open-ILS/src/templates/menu.tt2 b/Open-ILS/src/templates/menu.tt2
index fcd1992de9..48a7b371de 100644
--- a/Open-ILS/src/templates/menu.tt2
+++ b/Open-ILS/src/templates/menu.tt2
@@ -1,29 +1,29 @@
 <div id='oils-menu-div'>
-    <div dojoType="dijit.Toolbar" class='menuBar'>
+    <div data-dojo-type="dijit.Toolbar" class='menuBar'>
 
-        <div dojoType="dijit.form.DropDownButton">
+        <div data-dojo-type="dijit.form.DropDownButton">
             <span>Acquisitions</span>
-            <div dojoType="dijit.Menu">
+            <div data-dojo-type="dijit.Menu">
 
                 <!-- ==========================================================================
                      Picklist SubMenu
                     ========================================================================== -->
-                <div dojoType="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
+                <div data-dojo-type="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
                     <span>Selection Lists</span>
-                     <div dojoType="dijit.Menu">
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                     <div data-dojo-type="dijit.Menu">
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
                             onClick="location.href = '[% ctx.base_path %]/acq/picklist/list';">
                             My Selection Lists
                         </div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
                             onClick="location.href = '[% ctx.base_path %]/acq/picklist/bib_search';">
                             Title Search
                         </div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
                             onClick="location.href = '[% ctx.base_path %]/acq/picklist/upload';">
                             Load Records
                         </div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
                             onClick="location.href = '[% ctx.base_path %]/acq/picklist/brief_record';">
                             New Brief Record
                         </div>
@@ -33,19 +33,19 @@
                 <!-- ==========================================================================
                      Purchase Order SubMenu
                     ========================================================================== -->
-                <div dojoType="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
+                <div data-dojo-type="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
                     <span>Purchase Orders</span>
-                     <div dojoType="dijit.Menu">
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                     <div data-dojo-type="dijit.Menu">
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
                             onClick="location.href = '[% ctx.base_path %]/acq/po/search';">
                             PO Search
                         </div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
                             onClick="location.href = '[% ctx.base_path %]/acq/lineitem/search';">
                             Lineitem Search
                         </div>
                         <!-- XXX 
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
                             onClick="location.href = '[% ctx.base_path %]/acq/po/marc_upload';">
                             Load Vendor Order Records
                         </div>
@@ -55,10 +55,10 @@
                 <!-- ==========================================================================
                      Receiving SubMenu
                     ========================================================================== -->
-                <div dojoType="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
+                <div data-dojo-type="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
                     <span>Receiving</span>
-                    <div dojoType="dijit.Menu">
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                    <div data-dojo-type="dijit.Menu">
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
                             onClick="location.href = '[% ctx.base_path %]/acq/receiving/process';">
                                 Receiving
                         </div>
@@ -67,47 +67,47 @@
             </div>
         </div>
 
-        <div dojoType="dijit.form.DropDownButton">
+        <div data-dojo-type="dijit.form.DropDownButton">
             <span>Admin</span>
-            <div dojoType="dijit.Menu">
-                <div dojoType="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
+            <div data-dojo-type="dijit.Menu">
+                <div data-dojo-type="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
                     <span>Acquisitions</span>
-                     <div dojoType="dijit.Menu">
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                     <div data-dojo-type="dijit.Menu">
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
                             onClick="location.href = '[% ctx.base_path %]/acq/fund/list';">Funds</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/acq/funding_source/list';">Funding Sources</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/conify/global/acq/provider';">Providers</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/acq/currency_type/list';">Currency Types</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/conify/global/acq/exchange_rate';">Exchange Rates</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/conify/global/acq/distribution_formula';">Distribution Formulas</div>
                     </div>
                 </div>
-                <div dojoType="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
+                <div data-dojo-type="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
                     <span>Config</span>
-                     <div dojoType="dijit.Menu">
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                     <div data-dojo-type="dijit.Menu">
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/conify/global/config/billing_type';">Billing Types</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/conify/global/config/standing_penalty';">Standing Penalties</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/conify/global/permission/grp_penalty_threshold';">
                                     Group Penalty Thresholds</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/conify/global/config/idl_field_doc';">Field Documentation</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/conify/global/config/z3950_source';">Z39.50 Sources</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/conify/global/config/circ_modifier';">Circulation Modifiers</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/conify/global/action_trigger/event_definition';">Action Trigger</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
                              onClick="location.href = '[% ctx.base_path %]/conify/global/action/survey';">Surveys</div>
-                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                        <div data-dojo-type="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
                              onClick="location.href = '[% ctx.base_path %]/conify/global/config/org_unit_setting_type';">Org Unit Setting Types</div>
                     </div>
                 </div>
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 3a2f6f0f71..b78713503b 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -18,7 +18,7 @@
             <input type="text" id="search_box" name="query"
                 value="[% is_advanced ? ctx.naive_query_scrub(ctx.processed_search_query) : CGI.param('query') | html %]"
                 [%- IF use_autosuggest.enabled == "t" %]
-                dojoType="openils.widget.AutoSuggest" type_selector="'qtype'"
+                data-dojo-type="openils.widget.AutoSuggest" type_selector="'qtype'"
                 submitter="this.textbox.form.submit();"
                 [%-     IF use_autosuggest.value.search('opac_visible') %]
                 store_args='{"org_unit_getter": function() { return [% ctx.search_ou %]; }}'
diff --git a/Open-ILS/src/templates/password-reset/request-form.tt2 b/Open-ILS/src/templates/password-reset/request-form.tt2
index 10079cf5f6..c4b9ca6676 100644
--- a/Open-ILS/src/templates/password-reset/request-form.tt2
+++ b/Open-ILS/src/templates/password-reset/request-form.tt2
@@ -14,15 +14,15 @@
     <table>
       <tr>
         <td><label for="barcode">[% i18n.BARCODE_PROMPT %] </label></td>
-        <td><input type="text" id="barcode" name="barcode" dojoType="dijit.form.TextBox"/></td>
+        <td><input type="text" id="barcode" name="barcode" data-dojo-type="dijit.form.TextBox"/></td>
       </tr>
       <tr>
         <td><label for="username">[% i18n.USERNAME_PROMPT %] </label></td>
-        <td><input type="text" id="username" name="username" dojoType="dijit.form.TextBox"/></td>
+        <td><input type="text" id="username" name="username" data-dojo-type="dijit.form.TextBox"/></td>
       </tr>
     </table>
     <!--<label for="email">[% i18n.EMAIL_PROMPT %] </label><input type="text" name="email"/></br>-->
-    <button name="submit" id="submitButton" type="submit" dojoType="dijit.form.Button">[% i18n.BUTTON_SUBMIT %]</button>
+    <button name="submit" id="submitButton" type="submit" data-dojo-type="dijit.form.Button">[% i18n.BUTTON_SUBMIT %]</button>
   </form>
 </body>
 <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
diff --git a/Open-ILS/src/templates/serial/edit_siss.tt2 b/Open-ILS/src/templates/serial/edit_siss.tt2
index 55732899b2..7c989705b3 100644
--- a/Open-ILS/src/templates/serial/edit_siss.tt2
+++ b/Open-ILS/src/templates/serial/edit_siss.tt2
@@ -10,7 +10,7 @@
     openils.Util.addOnLoad(function() { drawSiss(siss_id, ssub_id) });
 </script>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
     <div id='edit-pane'> </div>
 </div>
 
diff --git a/Open-ILS/src/templates/serial/list_item.tt2 b/Open-ILS/src/templates/serial/list_item.tt2
index 30dd390a9c..349664de59 100644
--- a/Open-ILS/src/templates/serial/list_item.tt2
+++ b/Open-ILS/src/templates/serial/list_item.tt2
@@ -18,16 +18,16 @@
         font-weight: bold;
     }
 </style>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
         layoutAlign="top" class="oils-header-panel">
         <div>Items</div>
         <div>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="create_dialog.show()">New Items</button>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="sitem_grid.refresh()">Refresh Grid</button>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="sitem_grid.deleteSelected()">
                 Delete Selected
             </button>
@@ -37,8 +37,8 @@
         Showing items attached to the issuance,
         <em><a href="javascript:void(0);" id="siss_label_here"></a></em>.
     </div>
-    <table jsId="sitem_grid"
-        dojoType="openils.widget.AutoGrid"
+    <table data-dojo-id="sitem_grid"
+        data-dojo-type="openils.widget.AutoGrid"
         query="{id: '*'}"
         fieldOrder="['id','creator','editor','create_date','edit_date',
             'stream','date_expected','date_received','status','unit']"
@@ -64,13 +64,13 @@
         </thead>
     </table>
     <div class="hidden">
-        <div jsId="create_dialog" dojoType="dijit.Dialog"
+        <div data-dojo-id="create_dialog" data-dojo-type="dijit.Dialog"
             title="Create New Items" execute="create_new_items(arguments[0]);">
             <table class="create-dialog-table">
                 <tr>
                     <th>How many items?</th>
                     <td>
-                        <input dojoType="dijit.form.NumberSpinner" value="1"
+                        <input data-dojo-type="dijit.form.NumberSpinner" value="1"
                             name="count" constraints="{min: 1, max: 100}" />
                     </td>
                 </tr>
@@ -83,7 +83,7 @@
                 <tr>
                     <th>Date Expected</th>
                     <td>
-                        <input dojoType="dijit.form.DateTextBox"
+                        <input data-dojo-type="dijit.form.DateTextBox"
                             id="create-date-expected" name="date_expected"
                             required="false" />
                     </td>
@@ -91,14 +91,14 @@
                 <tr>
                     <th>Date Received</th>
                     <td>
-                        <input dojoType="dijit.form.DateTextBox"
+                        <input data-dojo-type="dijit.form.DateTextBox"
                             name="date_received" required="false" />
                     </td>
                 </tr>
                 <tr>
                     <th>Status</th>
                     <td>
-                        <select dojoType="dijit.form.FilteringSelect"
+                        <select data-dojo-type="dijit.form.FilteringSelect"
                             name="status">
                             [%- PROCESS status_values -%]
                         </select>
@@ -106,17 +106,17 @@
                 </tr>
                 <tr>
                     <td colspan="2" align="center">
-                        <span dojoType="dijit.form.Button" type="submit">
+                        <span data-dojo-type="dijit.form.Button" type="submit">
                             Create
                         </span>
                     </td>
                 </tr>
             </table>
         </div>
-        <select jsId="status_selector" dojoType="dijit.form.FilteringSelect">
+        <select data-dojo-id="status_selector" data-dojo-type="dijit.form.FilteringSelect">
             [%- PROCESS status_values -%]
         </select>
-        <div dojoType="openils.widget.ProgressDialog" jsId="progress_dialog">
+        <div data-dojo-type="openils.widget.ProgressDialog" data-dojo-id="progress_dialog">
         </div>
     </div>
 </div>
diff --git a/Open-ILS/src/templates/serial/list_stream.tt2 b/Open-ILS/src/templates/serial/list_stream.tt2
index 71ffa27f80..0bd518fe7a 100644
--- a/Open-ILS/src/templates/serial/list_stream.tt2
+++ b/Open-ILS/src/templates/serial/list_stream.tt2
@@ -6,23 +6,23 @@
     #new-srlu-table td { text-align: center; padding-right: 1em; }
     #list-source { border: 1px #666 dashed; }
 </style>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
         layoutAlign="top" class="oils-header-panel">
         <div>Streams</div>
         <div>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="sstr_grid.showCreateDialog()">New Stream</button>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="multi_stream_dialog.show()">
                 Create Many Streams
             </button>
-            <button dojoType="dijit.form.Button" onClick="rlu_editor.show()">
+            <button data-dojo-type="dijit.form.Button" onClick="rlu_editor.show()">
                 Routing List For Selected Stream
             </button>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="sstr_grid.refresh()">Refresh Grid</button>
-            <button dojoType="dijit.form.Button"
+            <button data-dojo-type="dijit.form.Button"
                 onClick="sstr_grid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
@@ -31,8 +31,8 @@
         <em><a href="javascript:void(0);" id="sdist_label_here"></a></em>
         (<span id="sdist_org_unit_name_here"></span>).
     </div>
-    <table jsId="sstr_grid"
-        dojoType="openils.widget.AutoGrid"
+    <table data-dojo-id="sstr_grid"
+        data-dojo-type="openils.widget.AutoGrid"
         query="{id: '*'}"
         fieldOrder="['id','distribution','routing_label']"
         suppressFields="['distribution']"
@@ -58,16 +58,16 @@
     <div id="routing_list_user_template_note"><br />&nbsp; <em>${0}</em></div>
     <div id="routing_list_user_template_remove">[X]</div>
 
-    <div dojoType="dijit.Dialog" id="routing_list_dialog"
+    <div data-dojo-type="dijit.Dialog" id="routing_list_dialog"
         execute="rlu_editor.save()" title="Manage Routing List">
-        <ol id="list-source" dojoType="dojo.dnd.Source"
-            jsId="routing_list_source"></ol>
+        <ol id="list-source" data-dojo-type="dojo.dnd.Source"
+            data-dojo-id="routing_list_source"></ol>
         <table id="new-srlu-table">
             <tbody>
                 <tr>
                     <td>
                         <input type="radio" name="reader_xor_dept"
-                            dojoType="dijit.form.RadioButton"
+                            data-dojo-type="dijit.form.RadioButton"
                             value="reader" id="reader_xor_dept-reader" />
                     </td>
                     <th>
@@ -76,11 +76,11 @@
                         </label>
                     </th>
                     <td>
-                        <input dojoType="dijit.form.TextBox" id="reader"
+                        <input data-dojo-type="dijit.form.TextBox" id="reader"
                             name="reader" disabled="disabled" />
                     </td>
                     <td rowspan="3">
-                        <button dojoType="dijit.form.Button"
+                        <button data-dojo-type="dijit.form.Button"
                             id="routing_list_add_button"
                             onClick="rlu_editor.new_user()">Add</button>
                     </td>
@@ -88,7 +88,7 @@
                 <tr>
                     <td>
                         <input type="radio" name="reader_xor_dept"
-                            dojoType="dijit.form.RadioButton"
+                            data-dojo-type="dijit.form.RadioButton"
                             value="department"
                             id="reader_xor_dept-department" />
                     </td>
@@ -98,7 +98,7 @@
                         </label>
                     </th>
                     <td>
-                        <input dojoType="dijit.form.TextBox" id="department"
+                        <input data-dojo-type="dijit.form.TextBox" id="department"
                             name="department" disabled="disabled" />
                     </td>
                 </tr>
@@ -107,13 +107,13 @@
                     <th><label for="note">Note:</label></th>
                     <td>
                         <input id="note" name="note"
-                            dojoType="dijit.form.TextBox" />
+                            data-dojo-type="dijit.form.TextBox" />
                     </td>
                 </tr>
                 <tr>
                     <td colspan="4" style="padding-top: 1em;">
                         <button id="routing_list_save_button"
-                            dojoType="dijit.form.Button" type="submit">
+                            data-dojo-type="dijit.form.Button" type="submit">
                             Save Changes
                         </button>
                     </td>
@@ -122,29 +122,29 @@
         </table>
     </div>
 
-    <div dojoType="dijit.Dialog"
+    <div data-dojo-type="dijit.Dialog"
         execute="create_many_streams(arguments[0]);"
         title="Create Streams"
-        jsId="multi_stream_dialog">
+        data-dojo-id="multi_stream_dialog">
         <table class="serial-dialog-table">
             <tr>
                 <th>How many?</th>
                 <td>
-                    <input dojoType="dijit.form.NumberSpinner"
+                    <input data-dojo-type="dijit.form.NumberSpinner"
                         value="1" smallDelta="1" name="quantity"
                         constraints="{'min': 1, 'max': 1000}" />
                 </td>
             </tr>
             <tr>
                 <td colspan="2">
-                    <button dojoType="dijit.form.Button" type="submit">
+                    <button data-dojo-type="dijit.form.Button" type="submit">
                         Create
                     </button>
                 </td>
             </tr>
         </table>
     </div>
-    <div dojoType="openils.widget.ProgressDialog" jsId="progress_dialog"></div>
+    <div data-dojo-type="openils.widget.ProgressDialog" data-dojo-id="progress_dialog"></div>
 </div>
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/serial/common.js"> </script>
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/serial/list_stream.js"> </script>
diff --git a/Open-ILS/src/templates/serial/list_subscription.tt2 b/Open-ILS/src/templates/serial/list_subscription.tt2
index 719bee0ca3..7394ac202b 100644
--- a/Open-ILS/src/templates/serial/list_subscription.tt2
+++ b/Open-ILS/src/templates/serial/list_subscription.tt2
@@ -9,16 +9,16 @@
 <script type="text/javascript">
     var _fallback_record_entry = "[% ctx.page_args.0 %]";
 </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane"
         layoutAlign="top" class="oils-header-panel">
         <div>Subscriptions</div>
         <div>
             <button
-                dojoType="dijit.form.Button"
+                data-dojo-type="dijit.form.Button"
                 onClick="ssub_grid.showCreateDialog()">New Subscription</button>
             <button
-                dojoType="dijit.form.Button"
+                data-dojo-type="dijit.form.Button"
                 onClick="ssub_grid.deleteSelected()">Delete Selected</button>
         </div>
     </div>
@@ -29,13 +29,13 @@
                 query="datafield[tag=245]" limit="1"></em>
             owned at or above:
         </span>
-        <select dojoType="openils.widget.OrgUnitFilteringSelect"
-            jsId="ssub_owner_select"
+        <select data-dojo-type="openils.widget.OrgUnitFilteringSelect"
+            data-dojo-id="ssub_owner_select"
             searchAttr="shortname" labelAttr="shortname">
         </select>
     </div>
-    <table jsId="ssub_grid"
-        dojoType="openils.widget.AutoGrid"
+    <table data-dojo-id="ssub_grid"
+        data-dojo-type="openils.widget.AutoGrid"
         query="{id: '*'}"
         fieldOrder="['id','owning_lib','start_date','end_date']"
         suppressFields="['record_entry']"
diff --git a/Open-ILS/src/templates/serial/subscription.tt2 b/Open-ILS/src/templates/serial/subscription.tt2
index d4bc78977f..ad50fd6a1a 100644
--- a/Open-ILS/src/templates/serial/subscription.tt2
+++ b/Open-ILS/src/templates/serial/subscription.tt2
@@ -12,28 +12,28 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/serial/subscription/issuance.js">
 </script>
 
-<div dojoType="dijit.layout.ContentPane" layout="top" class="oils-header-panel">
+<div data-dojo-type="dijit.layout.ContentPane" layout="top" class="oils-header-panel">
     <div>Subscription Details</div>
     <div>
-        <span dojoType="dijit.form.Button" onClick="clone_dialog.show();">
+        <span data-dojo-type="dijit.form.Button" onClick="clone_dialog.show();">
             Clone Subscription
         </span>
-        <span dojoType="dijit.form.Button" onClick="open_batch_receive();">
+        <span data-dojo-type="dijit.form.Button" onClick="open_batch_receive();">
             Batch Item Receive
         </span>
     </div>
 </div>
 
-<div dojoType="dijit.layout.TabContainer" jsId="tab_container"
+<div data-dojo-type="dijit.layout.TabContainer" data-dojo-id="tab_container"
     class="oils-serial-tab-container">
 
     <!-- Subscription Summary -->
-    <div dojoType="dijit.layout.ContentPane" title="Summary" selected="true">
+    <div data-dojo-type="dijit.layout.ContentPane" title="Summary" selected="true">
         <script type="dojo/connect" event="onShow">
             load_sub_grid(sub_id);
         </script>
-        <table jsId="sub_grid"
-            dojoType="dojox.grid.DataGrid" query="{id: '*'}" rowSelector="20px">
+        <table data-dojo-id="sub_grid"
+            data-dojo-type="dojox.grid.DataGrid" query="{id: '*'}" rowSelector="20px">
             <thead>
                 <tr>
                     <th field="id">ID</th>
@@ -58,7 +58,7 @@
     </div>
 
     <!-- Distributions -->
-    <div dojoType="dijit.layout.ContentPane" jsId="distributions_tab"
+    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-id="distributions_tab"
         title="Distributions" layoutAlign="client">
         <script type="dojo/connect" event="onShow">
             if (!dist_grid._fresh) {
@@ -115,7 +115,7 @@
     </div>
 
     <!-- Caption/Pattern -->
-    <div dojoType="dijit.layout.ContentPane"
+    <div data-dojo-type="dijit.layout.ContentPane"
         title="Captions and Patterns" layoutAlign="client">
         <script type="dojo/connect" event="onShow">
             if (!cap_editor) {
@@ -127,7 +127,7 @@
     </div>
 
     <!-- Issuances -->
-    <div dojoType="dijit.layout.ContentPane" jsId="issuances_tab"
+    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-id="issuances_tab"
         title="Issuances" layoutAlign="client">
         <script type="dojo/connect" event="onShow">
             if (!iss_grid._fresh) {
@@ -169,8 +169,8 @@
     </div>
 </div>
 <div class="hidden">
-    <div dojoType="openils.widget.ProgressDialog" jsId="progress_dialog"></div>
-    <div dojoType="dijit.Dialog" jsId="clone_dialog" title="Clone Subscription"
+    <div data-dojo-type="openils.widget.ProgressDialog" data-dojo-id="progress_dialog"></div>
+    <div data-dojo-type="dijit.Dialog" data-dojo-id="clone_dialog" title="Clone Subscription"
         style="width: 460px;" execute="clone_subscription(arguments[0]);">
         <div style="margin-bottom: 0.5em;">
             This feature will clone a subscription and all of its subscription
@@ -187,7 +187,7 @@
         <table width="100%">
             <tr>
                 <td style="padding-right: 0.5em; vertical-align: top;">
-                    <input dojoType="dijit.form.RadioButton"
+                    <input data-dojo-type="dijit.form.RadioButton"
                         id="use_ident_no" name="use_ident" value="no"
                         checked="checked" />
                 </td>
@@ -199,7 +199,7 @@
             </tr>
             <tr>
                 <td style="padding-right: 0.5em; vertical-align: top;">
-                    <input dojoType="dijit.form.RadioButton"
+                    <input data-dojo-type="dijit.form.RadioButton"
                         onChange="toggle_clone_ident_field(this);"
                         id="use_ident_yes" name="use_ident" value="yes" />
                 </td>
@@ -207,14 +207,14 @@
                     <label for="use_ident_yes">
                         Record specified by this unique identifier:
                     </label>
-                    <input dojoType="dijit.form.TextBox" name="ident"
-                        jsId="clone_ident" disabled="true"
+                    <input data-dojo-type="dijit.form.TextBox" name="ident"
+                        data-dojo-id="clone_ident" disabled="true"
                         style="margin-left: 0.5em; width: 10em;" />
                 </td>
             </tr>
             <tr>
                 <td colspan="2" align="center">
-                    <span dojoType="dijit.form.Button" type="submit">
+                    <span data-dojo-type="dijit.form.Button" type="submit">
                         Clone!
                     </span>
                 </td>
diff --git a/Open-ILS/src/templates/serial/subscription/caption_and_pattern.tt2 b/Open-ILS/src/templates/serial/subscription/caption_and_pattern.tt2
index 17d8e9d8d7..208585cd68 100644
--- a/Open-ILS/src/templates/serial/subscription/caption_and_pattern.tt2
+++ b/Open-ILS/src/templates/serial/subscription/caption_and_pattern.tt2
@@ -1,4 +1,4 @@
-<div dojoType="dijit.layout.ContentPane" layout="top">
+<div data-dojo-type="dijit.layout.ContentPane" layout="top">
     <table id="scap_editor" class="hidden">
         <thead>
             <tr>
@@ -65,15 +65,15 @@
         &nbsp; Edited by <span name="obj_edit"></span><br />
         <em class="hidden" name="obj_inactive">(Inactive)</em>
     </div>
-    <div dojoType="dijit.Dialog" execute="cap_importer.import()"
-        jsId="scaps_from_bib_dialog">
+    <div data-dojo-type="dijit.Dialog" execute="cap_importer.import()"
+        data-dojo-id="scaps_from_bib_dialog">
         <div>
             <em>
                 Select records from which to import caption and pattern fields.
             </em>
         </div>
         <div id="record_holder" style="padding: 1em 0;"></div>
-        <button dojoType="dijit.form.Button" type="submit">
+        <button data-dojo-type="dijit.form.Button" type="submit">
             Import
         </button>
     </div>
diff --git a/Open-ILS/src/templates/serial/subscription/distribution.tt2 b/Open-ILS/src/templates/serial/subscription/distribution.tt2
index 8a344bb2c7..17bd7f36f7 100644
--- a/Open-ILS/src/templates/serial/subscription/distribution.tt2
+++ b/Open-ILS/src/templates/serial/subscription/distribution.tt2
@@ -1,23 +1,23 @@
-<div dojoType="dijit.layout.ContentPane" layout="top"
+<div data-dojo-type="dijit.layout.ContentPane" layout="top"
     class="oils-header-panel lesser">
     <div>Distributions</div>
     <div style="margin-right: 16px;">
-        <span dojoType="dijit.form.Button"
+        <span data-dojo-type="dijit.form.Button"
             onClick="dist_grid.refresh();">Refresh Grid</span>
-        <span dojoType="dijit.form.Button"
+        <span data-dojo-type="dijit.form.Button"
             onClick="sub_grid._fresh = false; dist_grid.showCreateDialog();">
             New Distribution
         </span>
-        <span dojoType="dijit.form.Button"
+        <span data-dojo-type="dijit.form.Button"
             onClick="sub_grid._fresh = false; dist_grid.deleteSelected();">
             Delete Selected
         </span>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layout="top">
+<div data-dojo-type="dijit.layout.ContentPane" layout="top">
     <table
-        jsId="dist_grid"
-        dojoType="openils.widget.AutoGrid"
+        data-dojo-id="dist_grid"
+        data-dojo-type="openils.widget.AutoGrid"
         style="height: 550px;"
         fieldOrder="['subscription','label','holding_lib']"
         suppressFields="['record_entry','subscription','receive_call_number','bind_call_number','bind_unit_template']"
diff --git a/Open-ILS/src/templates/serial/subscription/issuance.tt2 b/Open-ILS/src/templates/serial/subscription/issuance.tt2
index 57a291ec2e..8901ea12bd 100644
--- a/Open-ILS/src/templates/serial/subscription/issuance.tt2
+++ b/Open-ILS/src/templates/serial/subscription/issuance.tt2
@@ -1,22 +1,22 @@
-<div dojoType="dijit.layout.ContentPane" layout="top"
+<div data-dojo-type="dijit.layout.ContentPane" layout="top"
     class="oils-header-panel lesser">
     <div>Issuances</div>
     <div style="margin-right: 16px;">
-        <span dojoType="dijit.form.Button"
+        <span data-dojo-type="dijit.form.Button"
             onclick="iss_grid.refresh();">Refresh Grid</span>
-        <span dojoType="dijit.form.Button"
+        <span data-dojo-type="dijit.form.Button"
             onclick="iss_grid.showCreatePane();">New Issuance</span>
-        <span dojoType="dijit.form.Button"
+        <span data-dojo-type="dijit.form.Button"
             onclick="iss_grid.deleteSelected();">Delete Selected</span>
     </div>
 </div>
 <div class="serial-additional-controls">
-    <span dojoType="dijit.form.Button"
+    <span data-dojo-type="dijit.form.Button"
         onclick="prediction_dialog.show();">Generate Predictions</span>
 </div>
-<div dojoType="dijit.layout.ContentPane" layout="top">
-    <table jsId="iss_grid"
-        dojoType="openils.widget.AutoGrid"
+<div data-dojo-type="dijit.layout.ContentPane" layout="top">
+    <table data-dojo-id="iss_grid"
+        data-dojo-type="openils.widget.AutoGrid"
         autoHeight="true"
         fieldOrder="['subscription','creator','editor','label','date_published','caption_and_pattern','holding_type']"
         suppressFields="['subscription','holding_link_id','create_date','edit_date','creator','editor']"
@@ -36,20 +36,20 @@
     </table>
 </div>
 <div class="hidden">
-    <div dojoType="dijit.Dialog"
+    <div data-dojo-type="dijit.Dialog"
         title="Generate Issuance and Item Predictions"
         execute="generate_predictions(arguments[0]);"
-        jsId="prediction_dialog">
+        data-dojo-id="prediction_dialog">
         <script type="dojo/connect" event="onShow">
             prepare_prediction_dialog();
         </script>
         <table class="serial-dialog-table">
             <tr>
                 <th>
-                    <input dojoType="dijit.form.RadioButton"
+                    <input data-dojo-type="dijit.form.RadioButton"
                         id="end_date" name="end_how" value="date"
                         checked="false" disabled="true"
-                        jsId="prediction_dialog_end_date" />
+                        data-dojo-id="prediction_dialog_end_date" />
                     <label for="end_date">
                         Predict until end of subscription
                     </label>
@@ -58,25 +58,25 @@
             </tr>
             <tr>
                 <th>
-                    <input dojoType="dijit.form.RadioButton"
+                    <input data-dojo-type="dijit.form.RadioButton"
                         id="end_num" name="end_how" value="number"
-                        checked="true" jsId="prediction_dialog_end_num"
+                        checked="true" data-dojo-id="prediction_dialog_end_num"
                         onChange="if (this.attr('checked')) setTimeout(function(){prediction_dialog_num_to_predict.focus();},200);" />
                     <label for="end_num">
                         Predict a certain number of issuances:
                     </label>
                 </th>
                 <td>
-                    <input dojoType="dijit.form.TextBox"
+                    <input data-dojo-type="dijit.form.TextBox"
                         style="width: 5em;"
-                        jsId="prediction_dialog_num_to_predict"
+                        data-dojo-id="prediction_dialog_num_to_predict"
                         name="num_to_predict" />
                 </td>
             </tr>
             <tr>
                 <td colspan="2">
-                    <button dojoType="dijit.form.Button"
-                        jsId="prediction_dialog_submit"
+                    <button data-dojo-type="dijit.form.Button"
+                        data-dojo-id="prediction_dialog_submit"
                         type="submit" disabled="true">Generate</button>
                 </td>
             </tr>
diff --git a/Open-ILS/src/templates/vandelay/inc/attrs.tt2 b/Open-ILS/src/templates/vandelay/inc/attrs.tt2
index 3e456e582e..4d6cc2af7d 100644
--- a/Open-ILS/src/templates/vandelay/inc/attrs.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/attrs.tt2
@@ -1,28 +1,28 @@
 <div style='float: left; margin-top: 8px;'>
-    <input dojoType="dijit.form.RadioButton" name="attrEditorGroup" value="bib" 
+    <input data-dojo-type="dijit.form.RadioButton" name="attrEditorGroup" value="bib" 
         id="aegB" onclick="setAttrEditorGroup('bib');" checked="checked"/>
     <label for="aegB" style="margin-right: 1em;">[% l('Bibliographic attributes') %]</label>
-    <input dojoType="dijit.form.RadioButton" name="attrEditorGroup" value="auth" 
+    <input data-dojo-type="dijit.form.RadioButton" name="attrEditorGroup" value="auth" 
         id="aegA" onclick="setAttrEditorGroup('auth');"/>
     <label for="aegA" style="margin-right: 1em;">[% l('Authority attributes') %]</label>
 </div>
-<div dojoType="dijit.form.DropDownButton" id="vl-create-attr-editor-button">
+<div data-dojo-type="dijit.form.DropDownButton" id="vl-create-attr-editor-button">
     <span name="create">[% l('Create Attribute Definition') %]</span>
-    <div dojoType="dijit.TooltipDialog" execute="vlSaveAttrDefinition(arguments[0]);" id="attr-editor-dialog">
+    <div data-dojo-type="dijit.TooltipDialog" execute="vlSaveAttrDefinition(arguments[0]);" id="attr-editor-dialog">
         <script type='dojo/connect' event='onOpen'>onAttrEditorOpen();</script>
         <script type='dojo/connect' event='onClose'>onAttrEditorClose();</script>
         <table class='dijitTooltipTable'>
             <tr>
                 <td><label for="code">[% l('Code') %]:</label></td>
-                <td><input id='attr-editor-code' name="code" dojoType="dijit.form.TextBox"/></td>
+                <td><input id='attr-editor-code' name="code" data-dojo-type="dijit.form.TextBox"/></td>
             </tr>
             <tr>
                 <td><label for="description">[% l('Description') %]:</label></td>
-                <td><input id='attr-editor-description' dojoType="dijit.form.TextBox" name="description"> </input></td>
+                <td><input id='attr-editor-description' data-dojo-type="dijit.form.TextBox" name="description"> </input></td>
             </tr>
             <tr>
                 <td><label for="amount">[% l('Tag(s)') %]:</label></td>
-                <td><input id="attr-editor-tags" dojoType="dijit.form.TextBox" name="tag"></input>
+                <td><input id="attr-editor-tags" data-dojo-type="dijit.form.TextBox" name="tag"></input>
                 <div class="hidden" id="attr-editor-tags-tip">
                 <p>[% l('You can enter multiple tags, separated by spaces and/or commas') %]</p>
                 <p>[% l('Example') %]:<code>120, 220, 300</code> or <code>120 220 330</code></p></div>
@@ -31,7 +31,7 @@
 
             <tr>
                 <td><label for="amount">[% l('Subfield(s)') %]:</label></td>
-                <td><input dojoType="dijit.form.TextBox" name="subfield" id="attr-editor-subfields"></input>
+                <td><input data-dojo-type="dijit.form.TextBox" name="subfield" id="attr-editor-subfields"></input>
                     <div class="hidden" id="attr-editor-subfields-tip">
                     <p>[% l('You can enter multiple subfields, separated by spaces and/or commas') %]</p>
                     <p>[% l('Example') %]: <code>a, b, j, x</code> or <code>a b j x</code></p></div>
@@ -40,28 +40,28 @@
             <tr>
                 <td><label for="attr-editor-xpath">[% l('XPath (advanced)') %]: </label></td>
 
-                <td><input dojoType="dijit.form.TextBox" id="attr-editor-xpath" name="xpath"></input></td>
+                <td><input data-dojo-type="dijit.form.TextBox" id="attr-editor-xpath" name="xpath"></input></td>
             </tr>
             <tr>
                 <td><label for="attr-editor-remove">[% l('Remove (advanced)') %]: </label></td>
 
-                <td><input dojoType="dijit.form.TextBox" id="attr-editor-remove" name="remove"></input></td>
+                <td><input data-dojo-type="dijit.form.TextBox" id="attr-editor-remove" name="remove"></input></td>
             </tr>
             <tr id="attr-editor-create-bar">
                 <td colspan='2' align='center'>
-                    <button dojoType="dijit.form.Button" type="submit" 
+                    <button data-dojo-type="dijit.form.Button" type="submit" 
                         id="attr-editor-create-button">[% l('Create') %]</button>
-                    <button type="button" dojoType="dijit.form.Button"
+                    <button type="button" data-dojo-type="dijit.form.Button"
                         onclick="dijit.byId('attr-editor-dialog').onCancel();">[% l('Cancel') %]</button>
                 </td>
             </tr>
             <tr id="attr-editor-update-bar">
                 <td colspan='2' align='center'>
-                    <button dojoType="dijit.form.Button" type="submit" 
+                    <button data-dojo-type="dijit.form.Button" type="submit" 
                         id="attr-editor-update-button">[% l('Update') %]</button>
-                    <button type="button" dojoType="dijit.form.Button"
+                    <button type="button" data-dojo-type="dijit.form.Button"
                         onclick="dijit.byId('attr-editor-dialog').onCancel();">[% l('Cancel') %]</button>
-                    <button dojoType="dijit.form.Button" 
+                    <button data-dojo-type="dijit.form.Button" 
                         type="button" 
                         id="attr-editor-delete-button"
                         style="padding-left: 2em;"
@@ -72,8 +72,8 @@
         </table>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <table dojoType='dojox.grid.DataGrid' jsId='attrEditorGrid' query="{id: '*'}" autoHeight='true'> 
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <table data-dojo-type='dojox.grid.DataGrid' data-dojo-id='attrEditorGrid' query="{id: '*'}" autoHeight='true'> 
         <thead>
             <tr>
                 <th field='id'>[% l('ID') %]</th>
diff --git a/Open-ILS/src/templates/vandelay/inc/export.tt2 b/Open-ILS/src/templates/vandelay/inc/export.tt2
index 5565a81012..3087c11782 100644
--- a/Open-ILS/src/templates/vandelay/inc/export.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/export.tt2
@@ -4,7 +4,7 @@
         <tr class='export_tr_border'>
             <td>[% l('Use Field Number') %]</td>
             <td>
-                <input dojoType='dijit.form.TextBox' type="text" size="2" maxlength="2" name="idcolumn" value="0"/>
+                <input data-dojo-type='dijit.form.TextBox' type="text" size="2" maxlength="2" name="idcolumn" value="0"/>
                 [% l('(starting from 0)') %]
             </td>
         </tr>
@@ -15,17 +15,17 @@
         <tr><td colspan='2'><b>[% l('Or') %]</b></td></tr>
         <tr class='export_tr_border'>
             <td>[% l('Record ID') %]</td>
-            <td><input dojoType='dijit.form.TextBox' type="text" size="12" maxlength="12" name="id"/></td>
+            <td><input data-dojo-type='dijit.form.TextBox' type="text" size="12" maxlength="12" name="id"/></td>
         </tr>
         <tr><td colspan='2'><b>[% l('Or') %]</b></td></tr>
         <tr class='export_tr_border'>
             <td>[% l('Record Bucket ID') %]</td>
-            <td><input dojoType='dijit.form.TextBox' type='text' name='containerid'/></td>
+            <td><input data-dojo-type='dijit.form.TextBox' type='text' name='containerid'/></td>
         </tr>
         <tr class='export_tr_border'>
             <td>[% l('Record Type') %]</td>
             <td>
-                <select name="rectype" dojoType='dijit.form.FilteringSelect'>
+                <select name="rectype" data-dojo-type='dijit.form.FilteringSelect'>
                     <option value="biblio">[% l('Bibliographic Records') %]</option>
                     <option value="authority">[% l('Authority Records') %]</option>
                 </select>
@@ -34,7 +34,7 @@
         <tr>
             <td>[% l('Record Format') %]</td>
             <td>
-                <select name="format" dojoType='dijit.form.FilteringSelect'>
+                <select name="format" data-dojo-type='dijit.form.FilteringSelect'>
                     <option value="USMARC">[% l('MARC21') %]</option>
                     <option value="UNIMARC">[% l('UNIMARC') %]</option>
                     <option value="XML">[% l('MARC XML') %]</option>
@@ -45,7 +45,7 @@
         <tr>
             <td>[% l('Record Encoding') %]</td>
             <td>
-                <select name="encoding" dojoType='dijit.form.FilteringSelect'>
+                <select name="encoding" data-dojo-type='dijit.form.FilteringSelect'>
                     <option value="UTF-8">[% l('UTF-8') %]</option>
                     <option value="MARC8">[% l('MARC8') %]</option>
                 </select>
@@ -53,11 +53,11 @@
         </tr>
         <tr>
             <td>[% l('Include holdings in Bibliographic Records') %]</td>
-            <td><input dojoType='dijit.form.CheckBox' type="checkbox" name="holdings" value="1"/></td>
+            <td><input data-dojo-type='dijit.form.CheckBox' type="checkbox" name="holdings" value="1"/></td>
         </tr>
         <tr>
             <td colspan='2'>
-                <button dojoType='dijit.form.Button' type="submit" value="Retrieve Records">[% l('Retrieve Records') %]</button>
+                <button data-dojo-type='dijit.form.Button' type="submit" value="Retrieve Records">[% l('Retrieve Records') %]</button>
             </td>
         </tr>
     </table>
diff --git a/Open-ILS/src/templates/vandelay/inc/import_errors.tt2 b/Open-ILS/src/templates/vandelay/inc/import_errors.tt2
index bf5e6398c8..57ad9364da 100644
--- a/Open-ILS/src/templates/vandelay/inc/import_errors.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/import_errors.tt2
@@ -1,10 +1,10 @@
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
-    <button dojoType='dijit.form.Button' 
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client'>
+    <button data-dojo-type='dijit.form.Button' 
         onclick="displayGlobalDiv('vl-queue-div');">&#x2196; [% l('Back To Import Queue') %]</button>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client'>
     <div id='vl-import-error-record' class='hidden'>
         <h1>Import Errors</h1><br/>
         <table>
@@ -22,10 +22,10 @@
     </div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client'>
     <div class='hidden' id='vl-import-error-grid-some'>
-        <table  jsId="vlImportErrorGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="vlImportErrorGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 autoHeight='true'
                 fieldOrder="['barcode', 'call_number', 'owning_lib', 'import_error', 'error_detail']"
                 query="{id: '*'}"
@@ -44,10 +44,10 @@
         </table>
     </div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client'>
     <div class='hidden' id='vl-import-error-grid-all'>
         <h1>Import Items</h1><br/>
-        <input dojoType='dijit.form.CheckBox' jsId='vlImportItemsShowErrors' onchange='vlLoadErrorUIAll();'/>
+        <input data-dojo-type='dijit.form.CheckBox' data-dojo-id='vlImportItemsShowErrors' onchange='vlLoadErrorUIAll();'/>
         <span>Limit to Import Failures</span>
         <table width='100%'><tr><td width='100%' align='right'>
             <select id='vl-item-export-options' style='margin-right: 10px;'>
@@ -58,8 +58,8 @@
                 <option value='email'>Email</option>
             </select>
         </td></tr></table>
-        <table  jsId="vlAllImportErrorGrid"
-                dojoType="openils.widget.AutoGrid"
+        <table  data-dojo-id="vlAllImportErrorGrid"
+                data-dojo-type="openils.widget.AutoGrid"
                 autoHeight='true'
                 fieldOrder="['barcode', 'call_number', 'owning_lib', 'import_error', 'error_detail']"
                 query="{id: '*'}"
diff --git a/Open-ILS/src/templates/vandelay/inc/item_attrs.tt2 b/Open-ILS/src/templates/vandelay/inc/item_attrs.tt2
index 611657ced7..7649db8fcc 100644
--- a/Open-ILS/src/templates/vandelay/inc/item_attrs.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/item_attrs.tt2
@@ -2,21 +2,21 @@
     Grid for configuring vandelay.import_item_attr_definition
 -->
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Import Item Attribute Definitions</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='itemAttrGrid.showCreatePane()'>New Definition</button>
-            <button dojoType='dijit.form.Button' onClick='itemAttrGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='itemAttrGrid.showCreatePane()'>New Definition</button>
+            <button data-dojo-type='dijit.form.Button' onClick='itemAttrGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
         <span style='padding-right:10px;'>Context Org Unit</span>
-        <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='itemAttrContextOrgSelector'
+        <select data-dojo-type="openils.widget.OrgUnitFilteringSelect" data-dojo-id='itemAttrContextOrgSelector'
             searchAttr='shortname' labelAttr='shortname'> </select>
     </div>
-    <table  jsId="itemAttrGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="itemAttrGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="[]"
             query="{id: '*'}"
             fmClass='viiad'
diff --git a/Open-ILS/src/templates/vandelay/inc/marchtml.tt2 b/Open-ILS/src/templates/vandelay/inc/marchtml.tt2
index 1a82220922..cde46f2189 100644
--- a/Open-ILS/src/templates/vandelay/inc/marchtml.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/marchtml.tt2
@@ -3,8 +3,8 @@
 <span class='hidden' id='vl-marc-edit-save-label'>[% l('Save Changes') %]</span>
 <span class='hidden' id='vl-marc-edit-complete-label'>[% l('Record Saved') %]</span>
 <div>
-    <button id='vl-marc-html-done-button' dojoType='dijit.form.Button'>&#x2196; [% l('Return') %]</button>
-    <button id='vl-marc-html-edit-button' dojoType='dijit.form.Button'>[% l('Edit') %]</button>
+    <button id='vl-marc-html-done-button' data-dojo-type='dijit.form.Button'>&#x2196; [% l('Return') %]</button>
+    <button id='vl-marc-html-edit-button' data-dojo-type='dijit.form.Button'>[% l('Edit') %]</button>
 </div>
 <div>
     <style type="text/css">#vl-marc-record-html td {padding:0px;}</style>
diff --git a/Open-ILS/src/templates/vandelay/inc/matches.tt2 b/Open-ILS/src/templates/vandelay/inc/matches.tt2
index 4e5d95bd2d..5151add7b1 100644
--- a/Open-ILS/src/templates/vandelay/inc/matches.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/matches.tt2
@@ -29,13 +29,13 @@
 </script>
 <h1>[% l('Import Matches') %]</h1><br/>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
-    <button dojoType='dijit.form.Button' 
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client'>
+    <button data-dojo-type='dijit.form.Button' 
         onclick="displayGlobalDiv('vl-queue-div');">&#x2196; [% l('Back To Import Queue') %]</button>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
-    <table dojoType='dojox.grid.DataGrid' jsId='vlMatchGrid' query='{id:"*"}' autoHeight='true'> 
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client'>
+    <table data-dojo-type='dojox.grid.DataGrid' data-dojo-id='vlMatchGrid' query='{id:"*"}' autoHeight='true'> 
     </table>
 </div>
 
diff --git a/Open-ILS/src/templates/vandelay/inc/profiles.tt2 b/Open-ILS/src/templates/vandelay/inc/profiles.tt2
index 0220d6a20e..85caa968b2 100644
--- a/Open-ILS/src/templates/vandelay/inc/profiles.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/profiles.tt2
@@ -1,18 +1,18 @@
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Overlay / Merge Profiles</div>
         <div>
-            <button dojoType='dijit.form.Button' onClick='pGrid.showCreateDialog()'>New Merge Profile</button>
-            <button dojoType='dijit.form.Button' onClick='pGrid.deleteSelected()'>Delete Selected</button>
+            <button data-dojo-type='dijit.form.Button' onClick='pGrid.showCreateDialog()'>New Merge Profile</button>
+            <button data-dojo-type='dijit.form.Button' onClick='pGrid.deleteSelected()'>Delete Selected</button>
         </div>
     </div>
     <div>
         <span style='padding-right:10px;'>Context Org Unit</span>
-        <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='profileContextOrgSelector'
+        <select data-dojo-type="openils.widget.OrgUnitFilteringSelect" data-dojo-id='profileContextOrgSelector'
             searchAttr='shortname' labelAttr='shortname'> </select>
     </div>
-    <table  jsId="pGrid"
-            dojoType="openils.widget.AutoGrid"
+    <table  data-dojo-id="pGrid"
+            data-dojo-type="openils.widget.AutoGrid"
             fieldOrder="['name', 'owner', 'preserve_spec', 'replace_spec', 'add_spec', 'strip_spec', 'lwm_ratio']"
             query="{id: '*'}"
             defaultCellWidth='"14%"'
diff --git a/Open-ILS/src/templates/vandelay/inc/progress.tt2 b/Open-ILS/src/templates/vandelay/inc/progress.tt2
index 71e979969e..b5ff3d9a6c 100644
--- a/Open-ILS/src/templates/vandelay/inc/progress.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/progress.tt2
@@ -1,10 +1,10 @@
 <div id="vl-generic-progress" class='progress'>
-    <div dojoType="dijit.ProgressBar" style="width:300px" indeterminate="true"></div>
+    <div data-dojo-type="dijit.ProgressBar" style="width:300px" indeterminate="true"></div>
 </div>
 <div id="vl-generic-progress-with-total" class='hidden progress'>
-    <div dojoType="dijit.ProgressBar" jsId='vlControlledProgressBar' style="width:300px"></div>
+    <div data-dojo-type="dijit.ProgressBar" data-dojo-id='vlControlledProgressBar' style="width:300px"></div>
 </div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-upload-status-div' class='hidden'>
+<div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-upload-status-div' class='hidden'>
     <h1>[% l('Upload Status') %]</h1><br/>
     <div id='vl-upload-status-uploading'>
         <h3>[% l('Uploading...') %]</h3>
diff --git a/Open-ILS/src/templates/vandelay/inc/queue.tt2 b/Open-ILS/src/templates/vandelay/inc/queue.tt2
index 850d3422d1..881d799664 100644
--- a/Open-ILS/src/templates/vandelay/inc/queue.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/queue.tt2
@@ -1,4 +1,4 @@
-<div dojoType="dijit.layout.ContentPane" layoutAlign='client' style='margin-top:10px;'>
+<div data-dojo-type="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'></span></legend>
         <table width='100%'><tr>
@@ -42,22 +42,22 @@
                                 <tr>
                                     <td>[% l('Limit to Records with Matches') %]</td>
                                     <td>
-                                        <input dojoType='dijit.form.CheckBox' 
-                                            jsId='vlQueueGridShowMatches' onchange='retrieveQueuedRecords();'/>
+                                        <input data-dojo-type='dijit.form.CheckBox' 
+                                            data-dojo-id='vlQueueGridShowMatches' onchange='retrieveQueuedRecords();'/>
                                     </td>
                                 </tr>
                                 <tr>
                                     <td>[% l('Limit to Non-Imported Records') %]</td>
                                     <td>
-                                        <input dojoType='dijit.form.CheckBox' 
-                                            jsId='vlQueueGridShowNonImport' onchange='retrieveQueuedRecords();'/>
+                                        <input data-dojo-type='dijit.form.CheckBox' 
+                                            data-dojo-id='vlQueueGridShowNonImport' onchange='retrieveQueuedRecords();'/>
                                     </td>
                                 </tr>
                                 <tr>
                                     <td>[% l('Limit to Records with Import Errors') %]</td>
                                     <td>
-                                        <input dojoType='dijit.form.CheckBox' 
-                                            jsId='vlQueueGridShowImportErrors' onchange='retrieveQueuedRecords();'/>
+                                        <input data-dojo-type='dijit.form.CheckBox' 
+                                            data-dojo-id='vlQueueGridShowImportErrors' onchange='retrieveQueuedRecords();'/>
                                     </td>
                                 </tr>
                             </tbody>
@@ -80,7 +80,7 @@
                         </select>
                         <span style='padding-right:5px;'>[% l('Records Per Page') %]</span>
                         <span class='queue-pager-span'>
-                            <select jsId='vlQueueDisplayLimit' id='vl-queue-display-limit-selector'
+                            <select data-dojo-id='vlQueueDisplayLimit' id='vl-queue-display-limit-selector'
                                 value='10' onchange='retrieveQueuedRecords();'>
                                 <option value='10'>10</option>
                                 <option value='20'>20</option>
@@ -91,7 +91,7 @@
 
                         <span class='queue-pager-span'>
                             <span style='padding-left:5px;'>[% l('Page') %]</span>
-                            <input style='width:36px;' dojoType='dijit.form.TextBox' jsId='vlQueueDisplayPage' value='1'/>
+                            <input style='width:36px;' data-dojo-type='dijit.form.TextBox' data-dojo-id='vlQueueDisplayPage' value='1'/>
                         </span>
 
                         <span style='padding-right:8px;'>
@@ -109,8 +109,8 @@
 </div>
 
 <!-- Bib Queue Grid -->
-<div class='' id='vl-bib-queue-grid-wrapper' dojoType='dijit.layout.ContentPane'>
-    <table dojoType='dojox.grid.DataGrid' jsId='vlBibQueueGrid' query="{id:'*'}" autoHeight='true'>
+<div class='' id='vl-bib-queue-grid-wrapper' data-dojo-type='dijit.layout.ContentPane'>
+    <table data-dojo-type='dojox.grid.DataGrid' data-dojo-id='vlBibQueueGrid' query="{id:'*'}" autoHeight='true'>
         <thead>
             <tr>
                 <th 
@@ -151,8 +151,8 @@
 </div>
 
 <!-- Auth Queue Grid -->
-<div class='' id='vl-auth-queue-grid-wrapper' dojoType='dijit.layout.ContentPane'>
-    <table dojoType='dojox.grid.DataGrid' jsId='vlAuthQueueGrid' query="{id:'*'}" autoHeight='true'> 
+<div class='' id='vl-auth-queue-grid-wrapper' data-dojo-type='dijit.layout.ContentPane'>
+    <table data-dojo-type='dojox.grid.DataGrid' data-dojo-id='vlAuthQueueGrid' query="{id:'*'}" autoHeight='true'> 
         <thead>
             <tr>
                 <th 
@@ -191,58 +191,58 @@
     <div></div>
 </div>
 
-<div jsId='queueItemsImportDialog' dojoType="dijit.Dialog" title="Import Items">
-    <div dojoType="dijit.layout.ContentPane">
+<div data-dojo-id='queueItemsImportDialog' data-dojo-type="dijit.Dialog" title="Import Items">
+    <div data-dojo-type="dijit.layout.ContentPane">
         <table class='form_table'>
             <tbody>
                 <tr>
                     <td>[% l('Merge Profile') %]</td>
                     <td colspan='4'>
-                        <div jsId='vlUploadMergeProfile2' 
-                            dojoType='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'></div>
+                        <div data-dojo-id='vlUploadMergeProfile2' 
+                            data-dojo-type='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'></div>
                     </td>
                 </tr>
                 <tr>
                     <td>[% l('Import Non-Matching Records') %]</td>
                     <td colspan='4'>
-                        <input jsId='vlUploadQueueImportNoMatch2' dojoType='dijit.form.CheckBox'/>
+                        <input data-dojo-id='vlUploadQueueImportNoMatch2' data-dojo-type='dijit.form.CheckBox'/>
                     </td>
                 </tr>
                 <tr>
                     <td>[% l('Merge On Exact Match (901c)') %]</td>
                     <td colspan='4'>
-                        <input jsId='vlUploadQueueAutoOverlayExact2' dojoType='dijit.form.CheckBox'/>
+                        <input data-dojo-id='vlUploadQueueAutoOverlayExact2' data-dojo-type='dijit.form.CheckBox'/>
                     </td>
                 </tr>
                 <tr>
                     <td>[% l('Merge On Single Match') %]</td>
                     <td colspan='4'>
-                        <input jsId='vlUploadQueueAutoOverlay1Match2' dojoType='dijit.form.CheckBox'/>
+                        <input data-dojo-id='vlUploadQueueAutoOverlay1Match2' data-dojo-type='dijit.form.CheckBox'/>
                     </td>
                 </tr>
                 <tr>
                     <td>[% l('Merge On Best Match') %]</td>
-                    <td colspan='4'><input jsId='vlUploadQueueAutoOverlayBestMatch2' dojoType='dijit.form.CheckBox'/></td>
+                    <td colspan='4'><input data-dojo-id='vlUploadQueueAutoOverlayBestMatch2' data-dojo-type='dijit.form.CheckBox'/></td>
                 </tr>
                 <tr>
                     <td>[% l('Best/Single Match Minimum Quality Ratio') %]</td>
                     <td colspan='4'>
-                        <input style='width:3em' value='0.0' jsId='vlUploadQueueAutoOverlayBestMatchRatio2' dojoType='dijit.form.TextBox'/>
+                        <input style='width:3em' value='0.0' data-dojo-id='vlUploadQueueAutoOverlayBestMatchRatio2' data-dojo-type='dijit.form.TextBox'/>
                         <span style='padding-left: 10px; font-size:90%'>[% l('New Record Quality / Quality of Best Match') %]</span>
                     </td>
                 </tr>
                 <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>
+                        <div data-dojo-id='vlUploadFtMergeProfile2' data-dojo-type='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'></div>
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <button dojoType='dijit.form.Button' jsId='queueItemsImportCancelButton'>Cancel</button>
+                        <button data-dojo-type='dijit.form.Button' data-dojo-id='queueItemsImportCancelButton'>Cancel</button>
                     </td>
                     <td>
-                        <button dojoType='dijit.form.Button' jsId='queueItemsImportGoButton'>Import</button>
+                        <button data-dojo-type='dijit.form.Button' data-dojo-id='queueItemsImportGoButton'>Import</button>
                     </td>
                 </tr>
             </tbody>
@@ -251,14 +251,14 @@
 </div>
 
 
-<div jsId='progressDialog' dojoType='openils.widget.ProgressDialog'></div>
-<div jsId='createBucketDialog' dojoType="dijit.Dialog" class='center' title="[% l('Copy Records to Bucket') %]">
-    <div dojoType="dijit.layout.ContentPane" class='pad-level-1'>
+<div data-dojo-id='progressDialog' data-dojo-type='openils.widget.ProgressDialog'></div>
+<div data-dojo-id='createBucketDialog' data-dojo-type="dijit.Dialog" class='center' title="[% l('Copy Records to Bucket') %]">
+    <div data-dojo-type="dijit.layout.ContentPane" class='pad-level-1'>
         <div class='pad-level-1'>[% l('Please enter the name of the bucket to append/create.') %]</div>
-        <div class='pad-level-1'><input dojoType='dijit.form.TextBox' name='name' id='create-bucket-dialog-name'/></div>
+        <div class='pad-level-1'><input data-dojo-type='dijit.form.TextBox' name='name' id='create-bucket-dialog-name'/></div>
         <div>
-            <button class='pad-level-1' dojoType="dijit.form.Button" type="submit" onClick="handleCreateBucket()">[% l('Apply') %]</button>
-            <button class='pad-level-1' dojoType="dijit.form.Button" type="submit" onClick="createBucketDialog.hide()">[% l('Cancel') %]</button>
+            <button class='pad-level-1' data-dojo-type="dijit.form.Button" type="submit" onClick="handleCreateBucket()">[% l('Apply') %]</button>
+            <button class='pad-level-1' data-dojo-type="dijit.form.Button" type="submit" onClick="createBucketDialog.hide()">[% l('Cancel') %]</button>
         </div>
     </div>
 </div>
diff --git a/Open-ILS/src/templates/vandelay/inc/queueselect.tt2 b/Open-ILS/src/templates/vandelay/inc/queueselect.tt2
index e6be9030d0..6d5f504168 100644
--- a/Open-ILS/src/templates/vandelay/inc/queueselect.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/queueselect.tt2
@@ -1,7 +1,7 @@
 <!-- Form for choosing which queue to view -->
 <h1>[% l('Select a Queue to Inspect') %]</h1><br/>
 [% l('Queue Type') %]
-<select jsId='vlQueueSelectType' dojoType='dijit.form.FilteringSelect' onchange='vlShowQueueSelect();'>
+<select data-dojo-id='vlQueueSelectType' data-dojo-type='dijit.form.FilteringSelect' onchange='vlShowQueueSelect();'>
     <option value='bib' selected='selected'>[% l('Bibliographic Records') %]</option>
     <option value='bib-acq'>[% l('Acquisitions Records') %]</option>
     <option value='auth'>[% l('Authority Records') %]</option>
diff --git a/Open-ILS/src/templates/vandelay/inc/toolbar.tt2 b/Open-ILS/src/templates/vandelay/inc/toolbar.tt2
index 61be2a6e35..17951e8151 100644
--- a/Open-ILS/src/templates/vandelay/inc/toolbar.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/toolbar.tt2
@@ -1,16 +1,16 @@
-<div dojoType="dijit.Toolbar" id='toolbar'>
-    <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy" id='vl-menu-marc-export'
+<div data-dojo-type="dijit.Toolbar" id='toolbar'>
+    <div data-dojo-type="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy" id='vl-menu-marc-export'
         onclick="displayGlobalDiv('vl-marc-export-div');" showLabel="true">[% l('Export Records') %]</div>
-    <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-marc-upload'
+    <div data-dojo-type="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-marc-upload'
         onclick="location.href = oilsBasePath + '/vandelay/vandelay';" showLabel="true">[% l('Import Records') %]</div>
-    <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-queue-select'
+    <div data-dojo-type="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-queue-select'
         onclick="location.href = oilsBasePath + '/vandelay/vandelay?page=inspectq';" showLabel="true">[% l('Inspect Queue') %]</div>
-    <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-attr-editor'
+    <div data-dojo-type="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-attr-editor'
         onclick="vlShowAttrEditor();" showLabel="true">[% l('Record Display Attributes') %]</div>
-    <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-profile-editor'
+    <div data-dojo-type="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-profile-editor'
         onclick="vlShowProfileEditor();" showLabel="true">[% l('Merge / Overlay Profiles') %]</div>
-    <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-match-set-editor'
+    <div data-dojo-type="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-match-set-editor'
         onclick="vlShowMatchSetEditor();" showLabel="true">[% l('Record Match Sets') %]</div>
-    <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-import-item-attr-editor'
+    <div data-dojo-type="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-import-item-attr-editor'
         onclick="vlShowImportItemAttrEditor();" showLabel="true">[% l('Import Item Attributes') %]</div>
 </div>
diff --git a/Open-ILS/src/templates/vandelay/inc/upload.tt2 b/Open-ILS/src/templates/vandelay/inc/upload.tt2
index 25d42e6209..8bd5a200bd 100644
--- a/Open-ILS/src/templates/vandelay/inc/upload.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/upload.tt2
@@ -5,8 +5,8 @@
         <tr>
             <td>[% l('Record Type') %]</td>
             <td colspan='4'>
-                <select id='vl-record-type' dojoType='dijit.form.FilteringSelect' 
-                        jsId='vlUploadRecordType' onchange='vlShowUploadForm();'>
+                <select id='vl-record-type' data-dojo-type='dijit.form.FilteringSelect' 
+                        data-dojo-id='vlUploadRecordType' onchange='vlShowUploadForm();'>
                     <option value='bib' selected='selected'>[% l('Bibliographic Records') %]</option>
                     <option value='auth'>[% l('Authority Records') %]</option>
                 </select>
@@ -15,33 +15,33 @@
         <tr>
             <td>[% l('Create a New Upload Queue') %]</td>
             <td>
-                <input type='text' dojoType='dijit.form.TextBox' id='vl-queue-name' size='32'></input>
+                <input type='text' data-dojo-type='dijit.form.TextBox' id='vl-queue-name' size='32'></input>
             </td>
             <td>[% l('or Add to an Existing Queue') %]</td>
             <td>
-                <select jsId='vlUploadQueueSelector' dojoType='dijit.form.FilteringSelect' required='false'>
+                <select data-dojo-id='vlUploadQueueSelector' data-dojo-type='dijit.form.FilteringSelect' required='false'>
                 </select>
             </td>
         </tr>
         <tr>
             <td>Record Match Set</td>
             <td>
-                <input jsId='vlUploadQueueMatchSet'
-                    dojoType='dijit.form.FilteringSelect' labelAttr='name' searchAttr='name'/>
+                <input data-dojo-id='vlUploadQueueMatchSet'
+                    data-dojo-type='dijit.form.FilteringSelect' labelAttr='name' searchAttr='name'/>
             </td>
         </tr>
         <tr>
             <td>Holdings Import Profile</td>
             <td>
-                <input jsId='vlUploadQueueHoldingsImportProfile'
-                    dojoType='dijit.form.FilteringSelect' labelAttr='name' searchAttr='name'/>
+                <input data-dojo-id='vlUploadQueueHoldingsImportProfile'
+                    data-dojo-type='dijit.form.FilteringSelect' labelAttr='name' searchAttr='name'/>
             </td>
         </tr>
         <tr>
             <td>[% l('Select a Record Source') %]</td>
             <td>
-                <select name='bib_source' jsId='vlUploadSourceSelector' 
-                    dojoType='dijit.form.FilteringSelect' labelAttr='source' searchAttr='source'/>
+                <select name='bib_source' data-dojo-id='vlUploadSourceSelector' 
+                    data-dojo-type='dijit.form.FilteringSelect' labelAttr='source' searchAttr='source'/>
             </td>
         </tr>
         <tr><td colspan='2' style='margin-top:10px;border-bottom:1px solid #888;border-top:2px solid #888'>
@@ -50,42 +50,42 @@
         <tr>
             <td>[% l('Merge Profile') %]</td>
             <td colspan='4'>
-                <div jsId='vlUploadMergeProfile' dojoType='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'></div>
+                <div data-dojo-id='vlUploadMergeProfile' data-dojo-type='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'></div>
             </td>
         </tr>
         <tr>
             <td>[% l('Import Non-Matching Records') %]</td>
             <td colspan='4'>
-                <input jsId='vlUploadQueueImportNoMatch' dojoType='dijit.form.CheckBox'/>
+                <input data-dojo-id='vlUploadQueueImportNoMatch' data-dojo-type='dijit.form.CheckBox'/>
             </td>
         </tr>
         <tr>
             <td>[% l('Merge On Exact Match (901c)') %]</td>
             <td colspan='4'>
-                <input jsId='vlUploadQueueAutoOverlayExact' dojoType='dijit.form.CheckBox'/>
+                <input data-dojo-id='vlUploadQueueAutoOverlayExact' data-dojo-type='dijit.form.CheckBox'/>
             </td>
         </tr>
         <tr>
             <td>[% l('Merge On Single Match') %]</td>
             <td colspan='4'>
-                <input jsId='vlUploadQueueAutoOverlay1Match' dojoType='dijit.form.CheckBox'/>
+                <input data-dojo-id='vlUploadQueueAutoOverlay1Match' data-dojo-type='dijit.form.CheckBox'/>
             </td>
         </tr>
         <tr>
             <td>[% l('Merge On Best Match') %]</td>
-            <td colspan='4'><input jsId='vlUploadQueueAutoOverlayBestMatch' dojoType='dijit.form.CheckBox'/></td>
+            <td colspan='4'><input data-dojo-id='vlUploadQueueAutoOverlayBestMatch' data-dojo-type='dijit.form.CheckBox'/></td>
         </tr>
         <tr>
             <td>[% l('Best/Single Match Minimum Quality Ratio') %]</td>
             <td colspan='4'>
-                <input style='width:3em' value='0.0' jsId='vlUploadQueueAutoOverlayBestMatchRatio' dojoType='dijit.form.TextBox'/>
+                <input style='width:3em' value='0.0' data-dojo-id='vlUploadQueueAutoOverlayBestMatchRatio' data-dojo-type='dijit.form.TextBox'/>
                 <span style='padding-left: 10px; font-size:90%'>[% l('New Record Quality / Quality of Best Match') %]</span>
             </td>
         </tr>
         <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>
+                <div data-dojo-id='vlUploadFtMergeProfile' data-dojo-type='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'></div>
             </td>
         </tr>
 
@@ -95,7 +95,7 @@
             <td colspan='5'>
                 <span id="vl-file-label">[% l('File to Upload:') %]</span>
                 <input size='48' style='border:1px solid #888;' type="file" name="marc_upload"/>
-                <span style='margin-left:10px;'><button dojoType="dijit.form.Button" onclick="batchUpload()">[% l('Upload') %]</button></span>
+                <span style='margin-left:10px;'><button data-dojo-type="dijit.form.Button" onclick="batchUpload()">[% l('Upload') %]</button></span>
             </td>
         </tr>
     </table>
diff --git a/Open-ILS/src/templates/vandelay/vandelay.tt2 b/Open-ILS/src/templates/vandelay/vandelay.tt2
index cfd6d2ba01..1de3855deb 100644
--- a/Open-ILS/src/templates/vandelay/vandelay.tt2
+++ b/Open-ILS/src/templates/vandelay/vandelay.tt2
@@ -8,43 +8,43 @@
 <div id="vl-page-loading">[% l('Loading...') %]</div>
 
 <div id='vl-body-wrapper' style="visibility: hidden;">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='top' id="vl-nav-bar" style="visibility: hidden;">
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='top' id="vl-nav-bar" style="visibility: hidden;">
         [% INCLUDE 'vandelay/inc/toolbar.tt2' %]
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client'>
         [% INCLUDE 'vandelay/inc/progress.tt2' %]
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-export-div' class='hidden content'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-export-div' class='hidden content'>
         [% INCLUDE 'vandelay/inc/export.tt2' %]
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-upload-div' class='hidden content'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-upload-div' class='hidden content'>
         [% INCLUDE 'vandelay/inc/upload.tt2' %]
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-div' class='hidden content'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-div' class='hidden content'>
         [% INCLUDE 'vandelay/inc/queue.tt2' %]
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-div' class='hidden content'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-div' class='hidden content'>
         [% INCLUDE 'vandelay/inc/matches.tt2' %]
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-html-div' class='hidden content'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' id='vl-marc-html-div' class='hidden content'>
         [% INCLUDE 'vandelay/inc/marchtml.tt2' %]
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-select-div' class='hidden content'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' id='vl-queue-select-div' class='hidden content'>
         [% INCLUDE 'vandelay/inc/queueselect.tt2' %]
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="client"  id="vl-attr-editor-div" 
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client"  id="vl-attr-editor-div" 
             class='hidden attr-editor-detail-content-pane content' title='[% l('Record Display Attributes') %]'>
         [% INCLUDE 'vandelay/inc/attrs.tt2' %]
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-profile-editor-div' class='hidden content'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' id='vl-profile-editor-div' class='hidden content'>
         [% INCLUDE 'vandelay/inc/profiles.tt2' %]
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-set-editor-div' class='hidden content'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-set-editor-div' class='hidden content'>
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-item-attr-editor-div' class='hidden content'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' id='vl-item-attr-editor-div' class='hidden content'>
         [% INCLUDE 'vandelay/inc/item_attrs.tt2' %]
     </div>
-    <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-import-error-div' class='hidden content'>
+    <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' id='vl-import-error-div' class='hidden content'>
         [% INCLUDE 'vandelay/inc/import_errors.tt2' %]
     </div>
 </div>
diff --git a/Open-ILS/web/conify/global/actor/org_unit.html b/Open-ILS/web/conify/global/actor/org_unit.html
index 6235e7fd47..dba5628d4f 100644
--- a/Open-ILS/web/conify/global/actor/org_unit.html
+++ b/Open-ILS/web/conify/global/actor/org_unit.html
@@ -65,9 +65,9 @@
 
 	<body class="tundra" id='pagebody'>
 
-		<div dojoType="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
+		<div data-dojo-type="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
 
-			<div dojoType="dijit.layout.ContentPane" sizeShare="100">
+			<div data-dojo-type="dijit.layout.ContentPane" sizeShare="100">
 				<script type="dojo/method">
 <![CDATA[
 
@@ -144,10 +144,10 @@
 				  id="ou_tree"
 				  label="&conify.org_unit.ou_tree.label;"
 				  query="{'_top':'true'}"
-				  dojoType="dijit.Tree"
+				  data-dojo-type="dijit.Tree"
 				  store="ou_list_store"
 				  minSize="200"
-				  jsId="ou_tree"
+				  data-dojo-id="ou_tree"
 				>
 
 					<script type="dojo/method" event="onClick" args="item,node">
@@ -204,32 +204,32 @@
 				</div>
 			</div>
 
-			<div jsId="right_pane" id="right_pane" dojoType="dijit.layout.ContentPane"  sizeShare="200">
+			<div data-dojo-id="right_pane" id="right_pane" data-dojo-type="dijit.layout.ContentPane"  sizeShare="200">
 				<script type="dojo/method">
 					window.right_pane_toggler = new dojo.fx.Toggler({ node: 'right_pane'});
 					window.right_pane_toggler.hide();
 				</script>
 
-				<div id="right_tabpane" dojoType="dijit.layout.TabContainer">
+				<div id="right_tabpane" data-dojo-type="dijit.layout.TabContainer">
 	
-					<div id="editor_pane" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.editor_pane.title;">
+					<div id="editor_pane" data-dojo-type="dijit.layout.ContentPane" title="&conify.org_unit.editor_pane.title;">
 
 						<table class="tundra" style="margin:10px;">
 							<tr>
 								<th>&conify.org_unit.editor_pane.org_unit_name;</th>
 								<td>
-									<span id="editor_pane_name" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_name" regExp=".+" required="true">
+									<span id="editor_pane_name" data-dojo-type="dijit.form.ValidationTextBox" data-dojo-id="editor_pane_name" regExp=".+" required="true">
 										<script type="dojo/connect" event="onChange">
 											if (current_ou) ou_list_store.setValue( current_ou, "name", this.getValue() );
 										</script>
 									</span>
-									<span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_ou" field="name"></span>
+									<span data-dojo-type="openils.widget.TranslatorPopup" targetObject="current_fm_ou" field="name"></span>
 								</td>
 							</tr>
 							<tr>
 								<th>&conify.org_unit.editor_pane.org_unit_code;</th>
 								<td>
-									<span id="editor_pane_shortname" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_shortname" uppercase="true" regExp=".+" required="true">
+									<span id="editor_pane_shortname" data-dojo-type="dijit.form.ValidationTextBox" data-dojo-id="editor_pane_shortname" uppercase="true" regExp=".+" required="true">
 										<script type="dojo/connect" event="onChange">
 											if (current_ou) ou_list_store.setValue( current_ou, "shortname", this.getValue() );
 										</script>
@@ -239,7 +239,7 @@
 							<tr>
 								<th>&conify.org_unit.editor_pane.main_email;</th>
 								<td>
-									<span id="editor_pane_email" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_email" regExp="^\w+(?:\.\w+)*\@\w+(?:\.\w+)+$">
+									<span id="editor_pane_email" data-dojo-type="dijit.form.ValidationTextBox" data-dojo-id="editor_pane_email" regExp="^\w+(?:\.\w+)*\@\w+(?:\.\w+)+$">
 										<script type="dojo/connect" event="onChange">
 											if (current_ou) ou_list_store.setValue( current_ou, "email", this.getValue() );
 										</script>
@@ -249,7 +249,7 @@
 							<tr>
 								<th>&conify.org_unit.editor_pane.main_phone;</th>
 								<td>
-									<span id="editor_pane_phone" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_phone" regExp="^(?:(?:\d{1}[ -\.])?\(?\d{3}\)?[ -\.]{1})?\d{3}[ -\.]{1}\d{4}(| \S+.*)$">
+									<span id="editor_pane_phone" data-dojo-type="dijit.form.ValidationTextBox" data-dojo-id="editor_pane_phone" regExp="^(?:(?:\d{1}[ -\.])?\(?\d{3}\)?[ -\.]{1})?\d{3}[ -\.]{1}\d{4}(| \S+.*)$">
 										<script type="dojo/connect" event="onChange">
 											if (current_ou) ou_list_store.setValue( current_ou, "phone", this.getValue() );
 										</script>
@@ -261,8 +261,8 @@
 								<td>
 									<div
 									  id="editor_pane_ou_type"
-									  dojoType="dijit.form.FilteringSelect"
-									  jsId="editor_pane_ou_type"
+									  data-dojo-type="dijit.form.FilteringSelect"
+									  data-dojo-id="editor_pane_ou_type"
 									  store="ou_type_store"
 									  searchAttr="name"
 									  ignoreCase="true"
@@ -279,8 +279,8 @@
 								<td>
 									<div
 									  id="editor_pane_parent_ou"
-									  dojoType="dijit.form.FilteringSelect"
-									  jsId="editor_pane_parent_ou"
+									  data-dojo-type="dijit.form.FilteringSelect"
+									  data-dojo-id="editor_pane_parent_ou"
 									  store="ou_list_store"
 									  searchAttr="shortname"
 									  ignoreCase="true"
@@ -301,24 +301,24 @@
 								<td>
 									<input
 									  id="editor_pane_opac_visible"
-									  jsId="editor_pane_opac_visible"
+									  data-dojo-id="editor_pane_opac_visible"
 									  type="checkbox"
-									  dojoType="dijit.form.CheckBox"
+									  data-dojo-type="dijit.form.CheckBox"
 									  onChange="if (current_ou) ou_list_store.setValue( current_ou, 'opac_visible', this.checked ? 't' : 'f' );"
 									/>
 								</td>
 							</tr>
 						</table>
 	
-						<div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
+						<div data-dojo-type="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
 	
-							<button jsId="save_ou_button" dojoType="dijit.form.Button" label="&conify.save_button.label;" onClick="save_org()">
+							<button data-dojo-id="save_ou_button" data-dojo-type="dijit.form.Button" label="&conify.save_button.label;" onClick="save_org()">
 								<script type="dojo/connect" event="startup">
 									this.disabled = true;
 								</script>
 							</button>
 	
-							<button jsId="delete_ou_button" dojoType="dijit.form.Button" label="&conify.delete_button.label;">
+							<button data-dojo-id="delete_ou_button" data-dojo-type="dijit.form.Button" label="&conify.delete_button.label;">
 								<script type="dojo/connect" event="startup">
 									this.disabled = true;
 								</script>
@@ -423,7 +423,7 @@
 	
 						</div>
 	
-						<button jsId="new_kid_button" dojoType="dijit.form.Button" label="&conify.new_kid_button.label;">
+						<button data-dojo-id="new_kid_button" data-dojo-type="dijit.form.Button" label="&conify.new_kid_button.label;">
 							<script type="dojo/connect" event="startup">
 								this.disabled = true;
 							</script>
@@ -467,47 +467,47 @@
 	
 					</div>
 
-					<div id="hoo_pane" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.hoo_pane.title;">
+					<div id="hoo_pane" data-dojo-type="dijit.layout.ContentPane" title="&conify.org_unit.hoo_pane.title;">
 						<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() );"></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>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_0_open" onChange="current_ou_hoo.dow_0_open( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_0_close" onChange="current_ou_hoo.dow_0_close( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="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() );"></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>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_1_open" onChange="current_ou_hoo.dow_1_open( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_1_close" onChange="current_ou_hoo.dow_1_close( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="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() );"></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>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_2_open" onChange="current_ou_hoo.dow_2_open( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_2_close" onChange="current_ou_hoo.dow_2_close( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="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() );"></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>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_3_open" onChange="current_ou_hoo.dow_3_open( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_3_close" onChange="current_ou_hoo.dow_3_close( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="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() );"></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>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_4_open" onChange="current_ou_hoo.dow_4_open( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_4_close" onChange="current_ou_hoo.dow_4_close( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="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() );"></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>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_5_open" onChange="current_ou_hoo.dow_5_open( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_5_close" onChange="current_ou_hoo.dow_5_close( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="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() );"></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>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_6_open" onChange="current_ou_hoo.dow_6_open( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="dijit.form.TimeTextBox" style="width:8em;" data-dojo-id="dow_6_close" onChange="current_ou_hoo.dow_6_close( this.getDisplayedValue() );"></span></td>
+								<td><span data-dojo-type="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>
 	
-						<button jsId="save_hoo_button" dojoType="dijit.form.Button" label="&conify.save_button.label;">
+						<button data-dojo-id="save_hoo_button" data-dojo-type="dijit.form.Button" label="&conify.save_button.label;">
                             <script type="dojo/connect" event="startup">
                                 this.disabled = true;
                             </script>
@@ -536,9 +536,9 @@
 	
 					</div>
 	
-					<div id="addresses_pane" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.title;">
+					<div id="addresses_pane" data-dojo-type="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.title;">
 						
-						<div id="billing_address_pane" dojoType="dijit.layout.TabContainer" style="margin-top:10px">
+						<div id="billing_address_pane" data-dojo-type="dijit.layout.TabContainer" style="margin-top:10px">
 	
 							<script type="dojo/method">
 								current_billing_address = null;
@@ -547,44 +547,44 @@
 								current_ill_address = null;
 							</script>
 	
-							<div id="billing_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.physical.title;">
+							<div id="billing_address" data-dojo-type="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.physical.title;">
 								<table class="tundra" style="margin:10px;">
 									<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>
+											<span data-dojo-id="billing_addr_type" style="width:100%;" data-dojo-type="dijit.form.TextBox" onChange="current_billing_address.address_type( this.getValue() )"></span>
 										</td>
 										<th>&conify.org_unit.addresses_pane.valid;</th><td>
 											<input
 											  type="checkbox"
-											  jsId="billing_addr_valid"
-											  dojoType="dijit.form.CheckBox"
+											  data-dojo-id="billing_addr_valid"
+											  data-dojo-type="dijit.form.CheckBox"
 											  value='t'
 											  onChange="if (current_billing_address) current_billing_address.valid( this.checked ? 't' : 'f' );"
 											/>
 										</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"></span></td>
+										<th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span data-dojo-id="billing_addr_street1" style="width:100%;" data-dojo-type="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() )"></span></td>
+										<th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span data-dojo-id="billing_addr_street2" style="width:100%;" data-dojo-type="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"></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>
+										<th>&conify.org_unit.addresses_pane.city;</th><td><span data-dojo-id="billing_addr_city" style="width:100%;" data-dojo-type="dijit.form.ValidationTextBox" onChange="current_billing_address.city( this.getValue() )" required="true"></span></td>
+										<th>&conify.org_unit.addresses_pane.state;</th><td><span data-dojo-id="billing_addr_state" style="width:100%;" data-dojo-type="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 data-dojo-id="billing_addr_post_code" style="width:100%;" data-dojo-type="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"></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>
+										<th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span data-dojo-id="billing_addr_country" style="width:100%;" data-dojo-type="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 data-dojo-id="billing_addr_county" style="width:100%;" data-dojo-type="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"></span></td>
+										<th>&conify.org_unit.addresses_pane.san;</th><td colspan="2"><span data-dojo-id="billing_addr_san" style="width:100%;" data-dojo-type="dijit.form.ValidationTextBox" onChange="current_billing_address.san( this.getValue() )" required="true"></span></td>
 									</tr>
 								</table>
 	
-								<button jsId="save_billing_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
+								<button data-dojo-id="save_billing_address" data-dojo-type="dijit.form.Button" label="&conify.save_button.label;">
 									<script type="dojo/connect" event="startup">
 										this.disabled = true;
 									</script>
@@ -618,41 +618,41 @@
 								</button>
 							</div>
 
-							<div id="holds_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.holds.title;">
+							<div id="holds_address" data-dojo-type="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() )"></span></td>
+										<th>&conify.org_unit.addresses_pane.type;</th><td colspan="3"><span data-dojo-id="holds_addr_type" style="width:100%;" data-dojo-type="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"
-											  jsId="holds_addr_valid"
-											  dojoType="dijit.form.CheckBox"
+											  data-dojo-id="holds_addr_valid"
+											  data-dojo-type="dijit.form.CheckBox"
 											  value='t'
 											  onChange="if (current_holds_address) current_holds_address.valid( this.checked ? 't' : 'f' );"
 											/>
 										</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"></span></td>
+										<th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span data-dojo-id="holds_addr_street1" style="width:100%;" data-dojo-type="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() )"></span></td>
+										<th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span data-dojo-id="holds_addr_street2" style="width:100%;" data-dojo-type="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"></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>
+										<th>&conify.org_unit.addresses_pane.city;</th><td><span data-dojo-id="holds_addr_city" style="width:100%;" data-dojo-type="dijit.form.ValidationTextBox" onChange="current_holds_address.city( this.getValue() )" required="true"></span></td>
+										<th>&conify.org_unit.addresses_pane.state;</th><td><span data-dojo-id="holds_addr_state" style="width:100%;" data-dojo-type="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 data-dojo-id="holds_addr_post_code" style="width:100%;" data-dojo-type="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"></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>
+										<th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span data-dojo-id="holds_addr_country" style="width:100%;" data-dojo-type="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 data-dojo-id="holds_addr_county" style="width:100%;" data-dojo-type="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"></span></td>
+										<th>&conify.org_unit.addresses_pane.san;</th><td colspan="2"><span data-dojo-id="holds_addr_san" style="width:100%;" data-dojo-type="dijit.form.ValidationTextBox" onChange="current_holds_address.san( this.getValue() )" required="true"></span></td>
 									</tr>
 								</table>
 	
-								<button jsId="save_holds_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
+								<button data-dojo-id="save_holds_address" data-dojo-type="dijit.form.Button" label="&conify.save_button.label;">
 									<script type="dojo/connect" event="startup">
 										this.disabled = true;
 									</script>
@@ -686,40 +686,40 @@
 								</button>
 							</div>
 
-							<div id="mailing_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.mailing.title;">
+							<div id="mailing_address" data-dojo-type="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() )"></span></td>
+										<th>&conify.org_unit.addresses_pane.type;</th><td colspan="3"><span data-dojo-id="mailing_addr_type" style="width:100%;" data-dojo-type="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"
-											  jsId="mailing_addr_valid"
-											  dojoType="dijit.form.CheckBox"
+											  data-dojo-id="mailing_addr_valid"
+											  data-dojo-type="dijit.form.CheckBox"
 											  onChange="if (current_mailing_address) current_mailing_address.valid( this.checked ? 't' : 'f' );"
 											/>
 										</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"></span></td>
+										<th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span data-dojo-id="mailing_addr_street1" style="width:100%;" data-dojo-type="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() )"></span></td>
+										<th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span data-dojo-id="mailing_addr_street2" style="width:100%;" data-dojo-type="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"></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>
+										<th>&conify.org_unit.addresses_pane.city;</th><td><span data-dojo-id="mailing_addr_city" style="width:100%;" data-dojo-type="dijit.form.ValidationTextBox" onChange="current_mailing_address.city( this.getValue() )" required="true"></span></td>
+										<th>&conify.org_unit.addresses_pane.state;</th><td><span data-dojo-id="mailing_addr_state" style="width:100%;" data-dojo-type="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 data-dojo-id="mailing_addr_post_code" style="width:100%;" data-dojo-type="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"></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>
+										<th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span data-dojo-id="mailing_addr_country" style="width:100%;" data-dojo-type="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 data-dojo-id="mailing_addr_county" style="width:100%;" data-dojo-type="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"></span></td>
+										<th>&conify.org_unit.addresses_pane.san;</th><td colspan="2"><span data-dojo-id="mailing_addr_san" style="width:100%;" data-dojo-type="dijit.form.ValidationTextBox" onChange="current_mailing_address.san( this.getValue() )" required="true"></span></td>
 									</tr>
 								</table>
 	
-								<button jsId="save_mailing_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
+								<button data-dojo-id="save_mailing_address" data-dojo-type="dijit.form.Button" label="&conify.save_button.label;">
 									<script type="dojo/connect" event="startup">
 										this.disabled = true;
 									</script>
@@ -753,40 +753,40 @@
 								</button>
 							</div>
 
-							<div id="ill_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.ill.title;">
+							<div id="ill_address" data-dojo-type="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() )"></span></td>
+										<th>&conify.org_unit.addresses_pane.type;</th><td colspan="3"><span data-dojo-id="ill_addr_type" style="width:100%;" data-dojo-type="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"
-											  jsId="ill_addr_valid"
-											  dojoType="dijit.form.CheckBox"
+											  data-dojo-id="ill_addr_valid"
+											  data-dojo-type="dijit.form.CheckBox"
 											  onChange="if (current_ill_address) current_ill_address.valid( this.checked ? 't' : 'f' );"
 											/>
 										</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"></span></td>
+										<th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span data-dojo-id="ill_addr_street1" style="width:100%;" data-dojo-type="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() )"></span></td>
+										<th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span data-dojo-id="ill_addr_street2" style="width:100%;" data-dojo-type="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"></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>
+										<th>&conify.org_unit.addresses_pane.city;</th><td><span data-dojo-id="ill_addr_city" style="width:100%;" data-dojo-type="dijit.form.ValidationTextBox" onChange="current_ill_address.city( this.getValue() )" required="true"></span></td>
+										<th>&conify.org_unit.addresses_pane.state;</th><td><span data-dojo-id="ill_addr_state" style="width:100%;" data-dojo-type="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 data-dojo-id="ill_addr_post_code" style="width:100%;" data-dojo-type="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"></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>
+										<th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span data-dojo-id="ill_addr_country" style="width:100%;" data-dojo-type="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 data-dojo-id="ill_addr_county" style="width:100%;" data-dojo-type="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"></span></td>
+										<th>&conify.org_unit.addresses_pane.san;</th><td colspan="2"><span data-dojo-id="ill_addr_san" style="width:100%;" data-dojo-type="dijit.form.ValidationTextBox" onChange="current_ill_address.san( this.getValue() )" required="true"></span></td>
 									</tr>
 								</table>
 	
-								<button jsId="save_ill_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
+								<button data-dojo-id="save_ill_address" data-dojo-type="dijit.form.Button" label="&conify.save_button.label;">
 									<script type="dojo/connect" event="startup">
 										this.disabled = true;
 									</script>
diff --git a/Open-ILS/web/conify/global/actor/org_unit_type.html b/Open-ILS/web/conify/global/actor/org_unit_type.html
index 4b1e843807..d766e05b28 100644
--- a/Open-ILS/web/conify/global/actor/org_unit_type.html
+++ b/Open-ILS/web/conify/global/actor/org_unit_type.html
@@ -106,17 +106,17 @@
 
 	<body class="tundra" id='pagebody'>
 
-		<div dojoType="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
+		<div data-dojo-type="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
 
-			<div dojoType="dijit.layout.ContentPane" sizeShare="100">
+			<div data-dojo-type="dijit.layout.ContentPane" sizeShare="100">
 				<div
 				  id="type_tree"
 				  label="&conify.org_unit_type.type_tree.label;"
 				  query="{'_top':'true'}"
-				  dojoType="dijit.Tree"
+				  data-dojo-type="dijit.Tree"
 				  store="ou_type_store"
 				  minSize="200"
-				  jsId="type_tree"
+				  data-dojo-id="type_tree"
 				>
 
 					<script type="dojo/method" event="onClick" args="item,node">
@@ -168,13 +168,13 @@
 				</div>
 			</div>
 
-			<div id="right_pane" dojoType="dijit.layout.ContentPane"  sizeShare="200">
+			<div id="right_pane" data-dojo-type="dijit.layout.ContentPane"  sizeShare="200">
 				<script type="dojo/method">
 					window.right_pane_toggler = new dojo.fx.Toggler({ node: 'right_pane'});
 					window.right_pane_toggler.hide();
 				</script>
 
-					<div id="editor_pane" dojoType="dijit.layout.ContentPane">
+					<div id="editor_pane" data-dojo-type="dijit.layout.ContentPane">
 						<script type="dojo/method">
 							highlighter.type_tree = {};
 							highlighter.editor_pane = {};
@@ -188,27 +188,27 @@
 							<tr>
 								<th>&conify.org_unit_type.type_name;</th>
 								<td>
-									<span id="editor_pane_name" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_name" regExp=".+" required="true">
+									<span id="editor_pane_name" data-dojo-type="dijit.form.ValidationTextBox" data-dojo-id="editor_pane_name" regExp=".+" required="true">
 										<script type="dojo/connect" event="onChange">
 											if (current_type) {
 												ou_type_store.setValue( current_type, "name", this.getValue() );
 											}
 										</script>
 									</span>
-									<span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_type" field="name"></span>
+									<span data-dojo-type="openils.widget.TranslatorPopup" targetObject="current_fm_type" field="name"></span>
 								</td>
 							</tr>
 							<tr>
 								<th>&conify.org_unit_type.opac_label;</th>
 								<td>
-									<span id="editor_pane_opac_label" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_opac_label" regExp=".+" required="true">
+									<span id="editor_pane_opac_label" data-dojo-type="dijit.form.ValidationTextBox" data-dojo-id="editor_pane_opac_label" regExp=".+" required="true">
 										<script type="dojo/connect" event="onChange">
 											if (current_type) {
 												ou_type_store.setValue( current_type, "opac_label", this.getValue() );
 											}
 										</script>
 									</span>
-									<span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_type" field="opac_label"></span>
+									<span data-dojo-type="openils.widget.TranslatorPopup" targetObject="current_fm_type" field="opac_label"></span>
 								</td>
 							</tr>
 							<tr>
@@ -216,8 +216,8 @@
 								<td>
 									<div
 									  id="editor_pane_parent"
-									  dojoType="dijit.form.FilteringSelect"
-									  jsId="editor_pane_parent"
+									  data-dojo-type="dijit.form.FilteringSelect"
+									  data-dojo-id="editor_pane_parent"
 									  store="ou_type_store"
 									  searchAttr="name"
 									  ignoreCase="true"
@@ -247,9 +247,9 @@
 								<td>
 									<input
 									  id="editor_pane_can_have_vols"
-									  jsId="editor_pane_can_have_vols"
+									  data-dojo-id="editor_pane_can_have_vols"
 									  type="checkbox"
-									  dojoType="dijit.form.CheckBox"
+									  data-dojo-type="dijit.form.CheckBox"
 									  onChange="if (current_type) ou_type_store.setValue( current_type, 'can_have_vols', this.checked ? 't' : 'f' );"
 									/>
 								</td>
@@ -259,24 +259,24 @@
 								<td>
 									<input
 									  id="editor_pane_can_have_users"
-									  jsId="editor_pane_can_have_users"
+									  data-dojo-id="editor_pane_can_have_users"
 									  type="checkbox"
-									  dojoType="dijit.form.CheckBox"
+									  data-dojo-type="dijit.form.CheckBox"
 									  onChange="if (current_type) ou_type_store.setValue( current_type, 'can_have_users', this.checked ? 't' : 'f' );"
 									/>
 								</td>
 							</tr>
 						</table>
 	
-						<div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
+						<div data-dojo-type="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
 	
-							<button jsId="save_out_button" dojoType="dijit.form.Button" label="&conify.save_button.label;" onClick="save_type()">
+							<button data-dojo-id="save_out_button" data-dojo-type="dijit.form.Button" label="&conify.save_button.label;" onClick="save_type()">
 								<script type="dojo/connect" event="startup">
 									this.disabled = true;
 								</script>
 							</button>
 	
-							<button jsId="delete_out_button" dojoType="dijit.form.Button" label="&conify.delete_button.label;">
+							<button data-dojo-id="delete_out_button" data-dojo-type="dijit.form.Button" label="&conify.delete_button.label;">
 								<script type="dojo/connect" event="startup">
 									this.disabled = true;
 								</script>
@@ -354,7 +354,7 @@
 	
 						</div>
 	
-						<button jsId="new_kid_button" dojoType="dijit.form.Button" label="&conify.new_kid_button.label;">
+						<button data-dojo-id="new_kid_button" data-dojo-type="dijit.form.Button" label="&conify.new_kid_button.label;">
 							<script type="dojo/connect" event="startup">
 								this.disabled = true;
 							</script>
diff --git a/Open-ILS/web/conify/global/admin.html b/Open-ILS/web/conify/global/admin.html
index d91d03a960..08bd49293c 100644
--- a/Open-ILS/web/conify/global/admin.html
+++ b/Open-ILS/web/conify/global/admin.html
@@ -59,12 +59,12 @@
 
 	</head>
 	<body class="tundra" id='pagebody'>
-		<div dojoType="dijit.layout.LayoutContainer" style="height: 100%; width: 100%; margin: 0; padding: 0; border: 0;">
-			<div id="top_pane" jsId="top_pane" dojoType="dijit.layout.ContentPane" layoutAlign="top" orientation="horizontal" style="margin: 4px; width: 100%; text-align: middle;" title="&conify.admin.top_pane.controls;">
+		<div data-dojo-type="dijit.layout.LayoutContainer" style="height: 100%; width: 100%; margin: 0; padding: 0; border: 0;">
+			<div id="top_pane" data-dojo-id="top_pane" data-dojo-type="dijit.layout.ContentPane" layoutAlign="top" orientation="horizontal" style="margin: 4px; width: 100%; text-align: middle;" title="&conify.admin.top_pane.controls;">
 				<img src="/opac/images/small_logo.jpg"/>
 				<span style="font-size: large; padding-left: 20px;"> &conify.admin.configure; </span>
 			</div>
-			<div id="left_pane" jsId="left_pane" dojoType="dijit.layout.ContentPane" layoutAlign="left" orientation="vertical" style="height: 90%; margin: 4px;" label="&conify.admin.left_pane.controls;">
+			<div id="left_pane" data-dojo-id="left_pane" data-dojo-type="dijit.layout.ContentPane" layoutAlign="left" orientation="vertical" style="height: 90%; margin: 4px;" label="&conify.admin.left_pane.controls;">
 				<ul style="margin-left: -10px;">
 					<li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'actor/org_unit_type.html'; return false;">&conify.admin.org_unit_type.link;</a></li>
 					<li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'actor/org_unit.html'; return false;">&conify.admin.org_unit.link;</a></li>
@@ -74,10 +74,10 @@
 					<li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'config/marc_code_maps.html'; return false;">&conify.admin.marc_code_maps.link;</a></li>
 				</ul>
 			</div>
-			<div id="content_pane" jsId="content_pane" dojoType="dijit.layout.ContentPane" layoutAlign="client" style="margin: 2px; border-top: 2px solid grey; border-bottom: 2px solid grey; border-left: 2px solid grey;">
+			<div id="content_pane" data-dojo-id="content_pane" data-dojo-type="dijit.layout.ContentPane" layoutAlign="client" style="margin: 2px; border-top: 2px solid grey; border-bottom: 2px solid grey; border-left: 2px solid grey;">
 				<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="">
+			<div id="bottom_pane" data-dojo-id="bottom_pane" data-dojo-type="dijit.layout.ContentPane" layoutAlign="bottom" orientation="horizontal" style="margin: 4px; height: 5%; width: 100%" title="">
 				<span id="status_text"></span>
 			</div>
 		</div>
diff --git a/Open-ILS/web/conify/global/config/copy_status.html b/Open-ILS/web/conify/global/config/copy_status.html
index 262eaf21c9..8af8059a8e 100644
--- a/Open-ILS/web/conify/global/config/copy_status.html
+++ b/Open-ILS/web/conify/global/config/copy_status.html
@@ -115,12 +115,12 @@
 
 	<body class="tundra" id='pagebody'>
 
-		<div dojoType="dijit.layout.LayoutContainer" id="grid_container" jsId="grid_container" orientation="vertical">
+		<div data-dojo-type="dijit.layout.LayoutContainer" id="grid_container" data-dojo-id="grid_container" orientation="vertical">
 
-			<div dojoType="dijit.layout.LayoutContainer" orientation="horizontal" style="margin-top: 5px;" layoutAlign="top">
+			<div data-dojo-type="dijit.layout.LayoutContainer" orientation="horizontal" style="margin-top: 5px;" layoutAlign="top">
 				<span>&conify.copy_status.new_status.label;</span>
-				<div dojoType="dijit.form.TextBox" id="new_status_code" jsId="new_status_name" label="&conify.copy_status.new_status.name;"></div>
-				<button dojoType="dijit.form.Button" id="save_new_status_code" jsId="save_new_status_name" label="&conify.copy_status.new_status.save;"> 
+				<div data-dojo-type="dijit.form.TextBox" id="new_status_code" data-dojo-id="new_status_name" label="&conify.copy_status.new_status.name;"></div>
+				<button data-dojo-type="dijit.form.Button" id="save_new_status_code" data-dojo-id="save_new_status_name" label="&conify.copy_status.new_status.save;"> 
 					<script type="dojo/connect" event="onClick">
 <![CDATA[
 						var new_name = new_status_name.getValue();
@@ -151,9 +151,9 @@
 				</button>
 			</div>
 
-			<div dojoType="dijit.layout.ContentPane" style="width:100%; height:100%;" layoutAlign="client">
-				<div dojoType="dojox.grid.data.DojoData" id="status_data_model" jsId="status_data_model" store="status_store" query="{ 'id' : '*' }"></div>
-				<div id="status_grid" dojoType="dojox.Grid" jsId="status_grid">
+			<div data-dojo-type="dijit.layout.ContentPane" style="width:100%; height:100%;" layoutAlign="client">
+				<div data-dojo-type="dojox.grid.data.DojoData" id="status_data_model" data-dojo-id="status_data_model" store="status_store" query="{ 'id' : '*' }"></div>
+				<div id="status_grid" data-dojo-type="dojox.Grid" data-dojo-id="status_grid">
 					<script type="dojo/connect" event="startup">
 <![CDATA[
 						var g = this;
@@ -239,11 +239,11 @@
 				</div>
 			</div>
 
-			<div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 5px;" layoutAlign="bottom">
+			<div data-dojo-type="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 5px;" layoutAlign="bottom">
 		
-				<button jsId="save_ccs_button" dojoType="dijit.form.Button" label="&conify.copy_status.save_changes;" onClick="save_them_all()"></button>
+				<button data-dojo-id="save_ccs_button" data-dojo-type="dijit.form.Button" label="&conify.copy_status.save_changes;" onClick="save_them_all()"></button>
 		
-				<button jsId="delete_ccs_button" dojoType="dijit.form.Button" label="&conify.copy_status.delete_selected;">
+				<button data-dojo-id="delete_ccs_button" data-dojo-type="dijit.form.Button" label="&conify.copy_status.delete_selected;">
 					<script type="dojo/connect" event="onClick">
 <![CDATA[
 						var selected_rows = status_grid.selection.getSelected();
diff --git a/Open-ILS/web/conify/global/config/marc_code_maps.html b/Open-ILS/web/conify/global/config/marc_code_maps.html
index 9a8bbb0ad8..72c9e91ce7 100644
--- a/Open-ILS/web/conify/global/config/marc_code_maps.html
+++ b/Open-ILS/web/conify/global/config/marc_code_maps.html
@@ -215,25 +215,25 @@
 
 	<body class="tundra" id='pagebody'>
 
-		<div dojoType="dijit.layout.TabContainer" id="grid_container" class="grid_container" style="margin: 5px;" orientation="vertical" layoutAlign="top">
+		<div data-dojo-type="dijit.layout.TabContainer" id="grid_container" class="grid_container" style="margin: 5px;" orientation="vertical" layoutAlign="top">
 
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.audience_map.title;">
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+			<div data-dojo-type="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.audience_map.title;">
+				<div data-dojo-type="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
 		
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+					<div data-dojo-type="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
 						<div>&conify.marc_code_maps.audience_map.new.label;</div>
 						<input type="hidden" name="classname" value="cam"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<label for="description">&conify.marc_code_maps.audience_map.description;</label><input dojoType="dijit.form.TextBox" name="description" title="&conify.marc_code_maps.audience_map.description;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:10px" layoutAlign="bottom" jsId="delete_cam_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cam',cam_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+						<label for="code">&conify.marc_code_maps.new_code;</label><input data-dojo-type="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+						<label for="value">&conify.marc_code_maps.new_value;</label><input data-dojo-type="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+						<label for="description">&conify.marc_code_maps.audience_map.description;</label><input data-dojo-type="dijit.form.TextBox" name="description" title="&conify.marc_code_maps.audience_map.description;"/>
+						<button type="submit" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+						<button style="margin-left:10px" layoutAlign="bottom" data-dojo-id="delete_cam_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cam',cam_grid)"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="save_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
 					</div>
 		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="cam_model" store="stores.cam" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid" jsId="cam_grid">
+					<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+						<div data-dojo-type="dojox.grid.data.DojoData" data-dojo-id="cam_model" store="stores.cam" query="{ code : '*' }"></div>
+						<div data-dojo-type="dojox.Grid" data-dojo-id="cam_grid">
 							<script type="dojo/connect" event="startup">
 								this.setStructure(window.layouts.cam);
 								this.setModel(window.cam_model);
@@ -246,26 +246,26 @@
 
 			</div>
 		
-			<div id="cblvl_pane" dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.bib_level.title;">
+			<div id="cblvl_pane" data-dojo-type="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.bib_level.title;">
 				<script type="dojo/connect" event="onShow">
 					if (!window.cblvl_once) setTimeout("cblvl_grid.render()",0);
 					window.cblvl_once = 1;
 				</script>
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+				<div data-dojo-type="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
 
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+					<div data-dojo-type="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
 						<div>&conify.marc_code_maps.bib_level.new.label;</div>
 						<input type="hidden" name="classname" value="cblvl"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_cblvl_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cblvl',cblvl_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+						<label for="code">&conify.marc_code_maps.new_code;</label><input data-dojo-type="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+						<label for="value">&conify.marc_code_maps.new_value;</label><input data-dojo-type="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+						<button type="submit" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="delete_cblvl_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cblvl',cblvl_grid)"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="save_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
 					</div>
 		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="cblvl_model" store="stores.cblvl" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="cblvl_grid">
+					<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+						<div data-dojo-type="dojox.grid.data.DojoData" data-dojo-id="cblvl_model" store="stores.cblvl" query="{ code : '*' }"></div>
+						<div data-dojo-type="dojox.Grid"  data-dojo-id="cblvl_grid">
 							<script type="dojo/connect" event="startup">
 								this.setStructure(window.layouts.cblvl);
 								this.setModel(window.cblvl_model);
@@ -278,27 +278,27 @@
 
 			</div>
 
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.item_form.title;">
+			<div data-dojo-type="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.item_form.title;">
 				<script type="dojo/connect" event="onShow">
 					if (!window.cifm_once) setTimeout("cifm_grid.render()",0);
 					window.cifm_once = 1;
 				</script>
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+				<div data-dojo-type="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
 
-					<div jsId="new_form_form" dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top">
+					<div data-dojo-id="new_form_form" data-dojo-type="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top">
 						<div>&conify.marc_code_maps.item_form.new.label;</div>
 						<input type="hidden" name="classname" value="cifm"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;" onclick="create_marc_code(new_form_form)"></button>
+						<label for="code">&conify.marc_code_maps.new_code;</label><input data-dojo-type="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+						<label for="value">&conify.marc_code_maps.new_value;</label><input data-dojo-type="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+						<button data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.add;" onclick="create_marc_code(new_form_form)"></button>
 
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_cifm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cifm',cifm_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="delete_cifm_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cifm',cifm_grid)"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="save_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
 					</div>
 	
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="cifm_model" store="stores.cifm" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="cifm_grid">
+					<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+						<div data-dojo-type="dojox.grid.data.DojoData" data-dojo-id="cifm_model" store="stores.cifm" query="{ code : '*' }"></div>
+						<div data-dojo-type="dojox.Grid"  data-dojo-id="cifm_grid">
 							<script type="dojo/connect" event="startup">
 								this.setStructure(window.layouts.cifm);
 								this.setModel(window.cifm_model);
@@ -311,27 +311,27 @@
 
 			</div>
 
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.item_type.title;">
+			<div data-dojo-type="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.item_type.title;">
 				<script type="dojo/connect" event="onShow">
 					if (!window.citm_once) setTimeout("citm_grid.render()",0);
 					window.citm_once = 1;
 				</script>
 
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+				<div data-dojo-type="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
 
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+					<div data-dojo-type="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
 						<div>&conify.marc_code_maps.item_type.new.label;</div>
 						<input type="hidden" name="classname" value="citm"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_citm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('citm',citm_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+						<label for="code">&conify.marc_code_maps.new_code;</label><input data-dojo-type="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+						<label for="value">&conify.marc_code_maps.new_value;</label><input data-dojo-type="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+						<button type="submit" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="delete_citm_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('citm',citm_grid)"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="save_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
 					</div>
 		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="citm_model" store="stores.citm" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="citm_grid">
+					<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+						<div data-dojo-type="dojox.grid.data.DojoData" data-dojo-id="citm_model" store="stores.citm" query="{ code : '*' }"></div>
+						<div data-dojo-type="dojox.Grid"  data-dojo-id="citm_grid">
 							<script type="dojo/connect" event="startup">
 								this.setStructure(window.layouts.citm);
 								this.setModel(window.citm_model);
@@ -344,27 +344,27 @@
 
 			</div>
 
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.language.title;">
+			<div data-dojo-type="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.language.title;">
 				<script type="dojo/connect" event="onShow">
 					if (!window.clm_once) setTimeout("clm_grid.render()",0);
 					window.clm_once = 1;
 				</script>
 
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+				<div data-dojo-type="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
 
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+					<div data-dojo-type="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
 						<div>&conify.marc_code_maps.language.new.label;</div>
 						<input type="hidden" name="classname" value="clm"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_clm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('clm',clm_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+						<label for="code">&conify.marc_code_maps.new_code;</label><input data-dojo-type="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+						<label for="value">&conify.marc_code_maps.new_value;</label><input data-dojo-type="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+						<button type="submit" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="delete_clm_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('clm',clm_grid)"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="save_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
 					</div>
 		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="clm_model" store="stores.clm" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="clm_grid">
+					<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+						<div data-dojo-type="dojox.grid.data.DojoData" data-dojo-id="clm_model" store="stores.clm" query="{ code : '*' }"></div>
+						<div data-dojo-type="dojox.Grid"  data-dojo-id="clm_grid">
 							<script type="dojo/connect" event="startup">
 								this.setStructure(window.layouts.clm);
 								this.setModel(window.clm_model);
@@ -377,27 +377,27 @@
 
 			</div>
 
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.literary_form.title;">
+			<div data-dojo-type="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.literary_form.title;">
 				<script type="dojo/connect" event="onShow">
 					if (!window.clfm_once) setTimeout("clfm_grid.render()",0);
 					window.clfm_once = 1;
 				</script>
 
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+				<div data-dojo-type="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
 
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+					<div data-dojo-type="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
 						<div>&conify.marc_code_maps.literary_form.new.label;</div>
 						<input type="hidden" name="classname" value="clfm"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_clfm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('clfm',clfm_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+						<label for="code">&conify.marc_code_maps.new_code;</label><input data-dojo-type="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+						<label for="value">&conify.marc_code_maps.new_value;</label><input data-dojo-type="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+						<button type="submit" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="delete_clfm_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('clfm',clfm_grid)"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="save_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
 					</div>
 		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="clfm_model" store="stores.clfm" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="clfm_grid">
+					<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+						<div data-dojo-type="dojox.grid.data.DojoData" data-dojo-id="clfm_model" store="stores.clfm" query="{ code : '*' }"></div>
+						<div data-dojo-type="dojox.Grid"  data-dojo-id="clfm_grid">
 							<script type="dojo/connect" event="startup">
 								this.setStructure(window.layouts.clfm);
 								this.setModel(window.clfm_model);
@@ -410,27 +410,27 @@
 
 			</div>
 
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.video.title;">
+			<div data-dojo-type="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.video.title;">
 				<script type="dojo/connect" event="onShow">
 					if (!window.cvrfm_once) setTimeout("cvrfm_grid.render()",0);
 					window.cvrfm_once = 1;
 				</script>
 
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+				<div data-dojo-type="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
 
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+					<div data-dojo-type="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
 						<div>&conify.marc_code_maps.video.new.label;</div>
 						<input type="hidden" name="classname" value="cvrfm"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_cvrfm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cvrfm',cvrfm_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+						<label for="code">&conify.marc_code_maps.new_code;</label><input data-dojo-type="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+						<label for="value">&conify.marc_code_maps.new_value;</label><input data-dojo-type="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+						<button type="submit" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="delete_cvrfm_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cvrfm',cvrfm_grid)"></button>
+						<button style="margin-left:20px" layoutAlign="bottom" data-dojo-id="save_button" data-dojo-type="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
 					</div>
 		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="cvrfm_model" store="stores.cvrfm" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="cvrfm_grid">
+					<div data-dojo-type="dijit.layout.ContentPane" layoutAlign="client">
+						<div data-dojo-type="dojox.grid.data.DojoData" data-dojo-id="cvrfm_model" store="stores.cvrfm" query="{ code : '*' }"></div>
+						<div data-dojo-type="dojox.Grid"  data-dojo-id="cvrfm_grid">
 							<script type="dojo/connect" event="startup">
 								this.setStructure(window.layouts.cvrfm);
 								this.setModel(window.cvrfm_model);
diff --git a/Open-ILS/web/conify/global/permission/grp_tree.html b/Open-ILS/web/conify/global/permission/grp_tree.html
index ac2026f36c..bca2e4ce09 100644
--- a/Open-ILS/web/conify/global/permission/grp_tree.html
+++ b/Open-ILS/web/conify/global/permission/grp_tree.html
@@ -142,17 +142,17 @@
 
 	<body class="tundra" id='pagebody'>
 
-		<div dojoType="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
+		<div data-dojo-type="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
 
-			<div dojoType="dijit.layout.ContentPane" sizeShare="100">
+			<div data-dojo-type="dijit.layout.ContentPane" sizeShare="100">
 				<div
 				  id="group_tree"
                   label="&conify.grp_tree.permission_groups.label;"
-				  dojoType="dijit.Tree"
+				  data-dojo-type="dijit.Tree"
 				  store="group_store"
                   query="{'_top':'true'}"
 				  minSize="200"
-				  jsId="group_tree"
+				  data-dojo-id="group_tree"
 				>
 
 					<script type="dojo/method" event="onClick" args="item,node">
@@ -211,14 +211,14 @@
 				</div>
 			</div>
 
-			<div id="right_pane" dojoType="dijit.layout.ContentPane"  sizeShare="300">
+			<div id="right_pane" data-dojo-type="dijit.layout.ContentPane"  sizeShare="300">
 				<script type="dojo/method">
 					window.right_pane_toggler = new dojo.fx.Toggler({ node: 'right_pane'});
 					window.right_pane_toggler.hide();
 				</script>
 
-				<div dojoType="dijit.layout.TabContainer">
-					<div id="editor_pane" dojoType="dijit.layout.ContentPane" title="&conify.grp_tree.group_config.label;">
+				<div data-dojo-type="dijit.layout.TabContainer">
+					<div id="editor_pane" data-dojo-type="dijit.layout.ContentPane" title="&conify.grp_tree.group_config.label;">
 						<script type="dojo/method">
 							highlighter.group_tree = {};
 							highlighter.editor_pane = {};
@@ -232,14 +232,14 @@
 							<tr>
 								<th>&conify.grp_tree.group_name.label;</th>
 								<td>
-									<span id="editor_pane_name" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_name" regExp=".+" required="true">
+									<span id="editor_pane_name" data-dojo-type="dijit.form.ValidationTextBox" data-dojo-id="editor_pane_name" regExp=".+" required="true">
 										<script type="dojo/connect" event="onChange">
 											if (current_group) {
 												group_store.setValue( current_group, "name", this.getValue() );
 											}
 										</script>
 									</span>
-									<span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_group" field="name"></span>
+									<span data-dojo-type="openils.widget.TranslatorPopup" targetObject="current_fm_group" field="name"></span>
 								</td>
 							</tr>
 							<tr>
@@ -248,18 +248,18 @@
 									<span>
 										<textarea
 										  id="editor_pane_description"
-										  dojoType="dijit.form.Textarea"
-										  jsId="editor_pane_description"
+										  data-dojo-type="dijit.form.Textarea"
+										  data-dojo-id="editor_pane_description"
 										  onChange="if (current_group) group_store.setValue( current_group, 'description', this.getValue() );"
 										></textarea>
 									</span>
-									<span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_group" field="description"></span>
+									<span data-dojo-type="openils.widget.TranslatorPopup" targetObject="current_fm_group" field="description"></span>
 								</td>
 							</tr>
 							<tr>
 								<th>&conify.grp_tree.permission_interval.label;</th>
 								<td>
-									<span id="editor_pane_perm_interval" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_perm_interval" regExp="^\d+ (?:y.*|mo.*|d.*)$" required="true">
+									<span id="editor_pane_perm_interval" data-dojo-type="dijit.form.ValidationTextBox" data-dojo-id="editor_pane_perm_interval" regExp="^\d+ (?:y.*|mo.*|d.*)$" required="true">
 										<script type="dojo/connect" event="onChange">
 											if (current_group) {
 												group_store.setValue( current_group, "perm_interval", this.getValue() );
@@ -273,10 +273,10 @@
 								<td>
 									<div
 									  id="editor_pane_application_perm"
-									  dojoType="dijit.form.FilteringSelect"
+									  data-dojo-type="dijit.form.FilteringSelect"
 									  store="perm_name_store"
 									  searchAttr="code"
-									  jsId="editor_pane_application_perm"
+									  data-dojo-id="editor_pane_application_perm"
 									>
 										<script type="dojo/connect" event="onChange">
 <![CDATA[
@@ -293,8 +293,8 @@
 								<td>
 									<div
 									  id="editor_pane_hold_priority"
-									  dojoType="dijit.form.NumberSpinner"
-									  jsId="editor_pane_hold_priority"
+									  data-dojo-type="dijit.form.NumberSpinner"
+									  data-dojo-id="editor_pane_hold_priority"
 									>
 										<script type="dojo/connect" event="onChange">
 <![CDATA[
@@ -311,8 +311,8 @@
 								<td>
 									<div
 									  id="editor_pane_parent"
-									  dojoType="dijit.form.FilteringSelect"
-									  jsId="editor_pane_parent"
+									  data-dojo-type="dijit.form.FilteringSelect"
+									  data-dojo-id="editor_pane_parent"
 									  store="group_store"
 									  searchAttr="name"
 									  ignoreCase="true"
@@ -333,24 +333,24 @@
 								<td>
 									<input
 									  id="editor_pane_usergroup"
-									  jsId="editor_pane_usergroup"
+									  data-dojo-id="editor_pane_usergroup"
 									  type="checkbox"
-									  dojoType="dijit.form.CheckBox"
+									  data-dojo-type="dijit.form.CheckBox"
 									  onChange="if (current_group) group_store.setValue( current_group, 'usergroup', this.checked ? 't' : 'f' );"
 									/>
 								</td>
 							</tr>
 						</table>
 	
-						<div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
+						<div data-dojo-type="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
 	
-							<button jsId="save_group_button" dojoType="dijit.form.Button" label="&conify.grp_tree.save_button.label;" onClick="save_group()">
+							<button data-dojo-id="save_group_button" data-dojo-type="dijit.form.Button" label="&conify.grp_tree.save_button.label;" onClick="save_group()">
 								<script type="dojo/connect" event="startup">
 									this.disabled = true;
 								</script>
 							</button>
 	
-							<button jsId="delete_group_button" dojoType="dijit.form.Button" label="&conify.grp_tree.delete_button.label;">
+							<button data-dojo-id="delete_group_button" data-dojo-type="dijit.form.Button" label="&conify.grp_tree.delete_button.label;">
 								<script type="dojo/connect" event="startup">
 									this.disabled = true;
 								</script>
@@ -426,7 +426,7 @@
 	
 						</div>
 	
-						<button jsId="new_kid_button" dojoType="dijit.form.Button" label="&conify.grp_tree.new_child_button.label;">
+						<button data-dojo-id="new_kid_button" data-dojo-type="dijit.form.Button" label="&conify.grp_tree.new_child_button.label;">
 							<script type="dojo/connect" event="startup">
 								this.disabled = true;
 							</script>
@@ -464,17 +464,17 @@
 	
 					</div>
 
-					<div id="perm_pane" dojoType="dijit.layout.ContentPane" title="&conify.grp_tree.group_permissions.title;">
+					<div id="perm_pane" data-dojo-type="dijit.layout.ContentPane" title="&conify.grp_tree.group_permissions.title;">
 						<script type="dojo/connect" event="onShow">
 							perm_map_model.query = { grp : current_group ? group_store.getValue(current_group,'id') : -1 };
 							perm_map_model.refresh();
 							perm_grid.refresh();
 						</script>
-						<div dojoType="dijit.layout.LayoutContainer" orientation="horizontal" style="width:100%; height:100%;">
-							<div id="grid_container" dojoType="dijit.layout.ContentPane" sizeShare="1" layoutAlign="left">
-								<div dojoType="dojox.grid.data.DojoData" id="perm_map_model" jsId="perm_map_model" store="perm_map_store"></div>
+						<div data-dojo-type="dijit.layout.LayoutContainer" orientation="horizontal" style="width:100%; height:100%;">
+							<div id="grid_container" data-dojo-type="dijit.layout.ContentPane" sizeShare="1" layoutAlign="left">
+								<div data-dojo-type="dojox.grid.data.DojoData" id="perm_map_model" data-dojo-id="perm_map_model" store="perm_map_store"></div>
 	
-								<div id="perm_grid" dojoType="dojox.Grid" model="perm_map_model" jsId="perm_grid">
+								<div id="perm_grid" data-dojo-type="dojox.Grid" model="perm_map_model" data-dojo-id="perm_grid">
 									<script type="dojo/connect" event="startup">
 <![CDATA[
 										function get_item_part(model_field, item_search_field, item_part, model, store, datum, row) {
@@ -538,19 +538,19 @@
 								</div>
 							</div>
 
-							<div id="new_perm_container" dojoType="dijit.layout.ContentPane" sizeShare="1" layoutAlign="client">
+							<div id="new_perm_container" data-dojo-type="dijit.layout.ContentPane" sizeShare="1" layoutAlign="client">
 
-								<div dojoType="dijit.form.DropDownButton" id="new_popup" jsId="new_popup">
+								<div data-dojo-type="dijit.form.DropDownButton" id="new_popup" data-dojo-id="new_popup">
 									<span>&conify.grp_tree.new_mapping.label;</span>
-									<div  dojoType="dijit.TooltipDialog"> 
+									<div  data-dojo-type="dijit.TooltipDialog"> 
 										<table class="tundra">
 											<tr>
 												<td>&conify.grp_tree.permission.label;</td>
 												<td>
 													<div
-													  dojoType="dijit.form.FilteringSelect"
+													  data-dojo-type="dijit.form.FilteringSelect"
 													  Id="new_perm_select"
-													  jsId="new_perm_select"
+													  data-dojo-id="new_perm_select"
 													  store="perm_store"
 													  searchAttr="code"
 													  ignoreCase="true"
@@ -561,9 +561,9 @@
 												<td>&conify.grp_tree.depth.label;</td>
 												<td>
 													<div
-													  dojoType="dijit.form.FilteringSelect"
+													  data-dojo-type="dijit.form.FilteringSelect"
 													  Id="new_depth_select"
-													  jsId="new_depth_select"
+													  data-dojo-id="new_depth_select"
 													  store="ou_type_store"
 													  searchAttr="name"
 													  ignoreCase="true"
@@ -575,15 +575,15 @@
 												<td>
 													<input
 													  type="checkbox"
-													  dojoType="dijit.form.CheckBox"
+													  data-dojo-type="dijit.form.CheckBox"
 													  Id="new_grant_checkbox"
-													  jsId="new_grant_checkbox"
+													  data-dojo-id="new_grant_checkbox"
 													  value="t"></input>
 												</td>
 											</tr>
 										</table>
 
-										<button dojoType="dijit.form.Button" jsId="new_mapping_add" label="&conify.grp_tree.add_mapping_button.label;">
+										<button data-dojo-type="dijit.form.Button" data-dojo-id="new_mapping_add" label="&conify.grp_tree.add_mapping_button.label;">
 						                    <script type="dojo/connect" event="onClick">
 <![CDATA[
 						                        var new_perm = new_perm_select.getValue();
@@ -639,9 +639,9 @@
 									</div>
 								</div>
 
-								<button jsId="save_pgpm_button" dojoType="dijit.form.Button" label="&conify.grp_tree.save_changes.label;" onClick="save_them_all()"></button><br/>
+								<button data-dojo-id="save_pgpm_button" data-dojo-type="dijit.form.Button" label="&conify.grp_tree.save_changes.label;" onClick="save_them_all()"></button><br/>
 
-				                <button jsId="delete_pgpm_button" dojoType="dijit.form.Button" label="&conify.grp_tree.remove_selected.label;">
+				                <button data-dojo-id="delete_pgpm_button" data-dojo-type="dijit.form.Button" label="&conify.grp_tree.remove_selected.label;">
 					                <script type="dojo/connect" event="onClick">
 <![CDATA[
 				                        var selected_rows = perm_grid.selection.getSelected();
diff --git a/Open-ILS/web/conify/global/permission/perm_list.html b/Open-ILS/web/conify/global/permission/perm_list.html
index 680cf6104f..e6197c8b14 100644
--- a/Open-ILS/web/conify/global/permission/perm_list.html
+++ b/Open-ILS/web/conify/global/permission/perm_list.html
@@ -143,11 +143,11 @@
 
 	<body class="tundra" id='pagebody'>
 
-		<div dojoType="dijit.layout.LayoutContainer" id="grid_container" jsId="grid_container" orientation="vertical">
-			<div dojoType="dijit.layout.LayoutContainer" orientation="horizontal" style="margin-top: 5px;" layoutAlign="top">
+		<div data-dojo-type="dijit.layout.LayoutContainer" id="grid_container" data-dojo-id="grid_container" orientation="vertical">
+			<div data-dojo-type="dijit.layout.LayoutContainer" orientation="horizontal" style="margin-top: 5px;" layoutAlign="top">
 				<span>&conify.perm_list.new_permission.label;</span>
-				<div dojoType="dijit.form.TextBox" id="new_perm_code" jsId="new_perm_code" label="&conify.perm_list.new_code.label;"></div>
-				<button dojoType="dijit.form.Button" id="save_new_perm_code" jsId="save_new_perm_code" label="&conify.perm_list.add_button.label;"> 
+				<div data-dojo-type="dijit.form.TextBox" id="new_perm_code" data-dojo-id="new_perm_code" label="&conify.perm_list.new_code.label;"></div>
+				<button data-dojo-type="dijit.form.Button" id="save_new_perm_code" data-dojo-id="save_new_perm_code" label="&conify.perm_list.add_button.label;"> 
 					<script type="dojo/connect" event="onClick">
 <![CDATA[
 						var new_code = new_perm_code.getValue();
@@ -178,18 +178,18 @@
 				</button>
 			</div>
 
-			<div dojoType="dijit.layout.ContentPane" style="width:100%; height:100%;" layoutAlign="client">
-                <div dojoType="dojox.grid.data.DojoData" id="perm_data_model" jsId="perm_data_model" store="perm_store" query="{ code : '*' }">
+			<div data-dojo-type="dijit.layout.ContentPane" style="width:100%; height:100%;" layoutAlign="client">
+                <div data-dojo-type="dojox.grid.data.DojoData" id="perm_data_model" data-dojo-id="perm_data_model" store="perm_store" query="{ code : '*' }">
                 </div>
-				<div id="perm_grid" dojoType="dojox.Grid" model="perm_data_model" structure="perm_grid_layout" jsId="perm_grid">
+				<div id="perm_grid" data-dojo-type="dojox.Grid" model="perm_data_model" structure="perm_grid_layout" data-dojo-id="perm_grid">
 				</div>
 			</div>
 
-			<div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 5px;" layoutAlign="bottom">
+			<div data-dojo-type="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 5px;" layoutAlign="bottom">
 		
-				<button jsId="save_ppl_button" dojoType="dijit.form.Button" label="&conify.perm_list.save_changes.label;" onClick="save_them_all()"></button>
+				<button data-dojo-id="save_ppl_button" data-dojo-type="dijit.form.Button" label="&conify.perm_list.save_changes.label;" onClick="save_them_all()"></button>
 		
-				<button jsId="delete_ppl_button" dojoType="dijit.form.Button" label="&conify.perm_list.delete_selected.label;">
+				<button data-dojo-id="delete_ppl_button" data-dojo-type="dijit.form.Button" label="&conify.perm_list.delete_selected.label;">
 					<script type="dojo/connect" event="onClick">
 <![CDATA[
 						var selected_rows = perm_grid.selection.getSelected();
diff --git a/Open-ILS/web/js/dojo/openils/widget/FacetSidebar.js b/Open-ILS/web/js/dojo/openils/widget/FacetSidebar.js
index 25c2175d83..98bc0a0a84 100644
--- a/Open-ILS/web/js/dojo/openils/widget/FacetSidebar.js
+++ b/Open-ILS/web/js/dojo/openils/widget/FacetSidebar.js
@@ -23,7 +23,7 @@
     </div>
 
     <div
-        dojoType='openils.widget.FacetSidebar'
+        data-dojo-type='openils.widget.FacetSidebar'
         searchBox='facet_box'
         searchSubmit='search_submit'
         facetLimit='5'
@@ -222,7 +222,7 @@ if(!dojo._hasResource["openils.widget.FacetSidebar"]) {
 
             templateString : 
 '<div class="facetField" dojoAttachPoint="myTop">' +
-'  <div class="extraFacetFieldsWrapper" dojoAttachPoint="toggleExtraFacetFieldsWrapper"><button class="toggleExtraFacetFieldsButton" dojoType="dijit.form.Button" dojoAttachPoint="toggleExtraFacetFields" dojoAttachEvent="onClick:toggleExtraFacets"></button></div>' +
+'  <div class="extraFacetFieldsWrapper" dojoAttachPoint="toggleExtraFacetFieldsWrapper"><button class="toggleExtraFacetFieldsButton" data-dojo-type="dijit.form.Button" dojoAttachPoint="toggleExtraFacetFields" dojoAttachEvent="onClick:toggleExtraFacets"></button></div>' +
 '  <div class="facetFieldLabel" dojoAttachPoint="facetLabel"></div>' +
 '  <div class="facetFields" dojoAttachPoint="facetFields"></div>' +
 '  <div class="facetFields hide_me" dojoAttachPoint="extraFacetFields"></div>' +
diff --git a/Open-ILS/web/js/dojo/openils/widget/FilteringTreeSelect.js b/Open-ILS/web/js/dojo/openils/widget/FilteringTreeSelect.js
index 6443f89e0a..8dedc48417 100644
--- a/Open-ILS/web/js/dojo/openils/widget/FilteringTreeSelect.js
+++ b/Open-ILS/web/js/dojo/openils/widget/FilteringTreeSelect.js
@@ -1,6 +1,6 @@
 /* EXAMPLES:
 
-<input jsId='ftree' dojoType="openils.widget.FilteringTreeSelect" searchAttr='shortname' labelAttr='shortname' tree='myTree'/>
+<input data-dojo-id='ftree' data-dojo-type="openils.widget.FilteringTreeSelect" searchAttr='shortname' labelAttr='shortname' tree='myTree'/>
 
 --- OR --
 
diff --git a/Open-ILS/web/js/dojo/openils/widget/Searcher.js b/Open-ILS/web/js/dojo/openils/widget/Searcher.js
index 896c0494f2..234fd7f4ac 100644
--- a/Open-ILS/web/js/dojo/openils/widget/Searcher.js
+++ b/Open-ILS/web/js/dojo/openils/widget/Searcher.js
@@ -54,8 +54,8 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
 "          <span dojoAttachPoint='searcherClassedSearchesLabel' class='searcherClassedSearchesLabel'></span>" +
 "        </div>" +
 "        <div class='searcherClassedSearchesAddContainer'>" +
-"          <button dojoType='dijit.form.Button' dojoAttachPoint='andClassedSearch' dojoAttachEvent='onClick:addClassAnd'></button>" +
-"          <button dojoType='dijit.form.Button' dojoAttachPoint='orClassedSearch' dojoAttachEvent='onClick:addClassOr'></button>" +
+"          <button data-dojo-type='dijit.form.Button' dojoAttachPoint='andClassedSearch' dojoAttachEvent='onClick:addClassAnd'></button>" +
+"          <button data-dojo-type='dijit.form.Button' dojoAttachPoint='orClassedSearch' dojoAttachEvent='onClick:addClassOr'></button>" +
 "        </div>" +
 "      </div>" +
 
@@ -64,7 +64,7 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
 "          <span dojoAttachPoint='searcherFacetedSearchesLabel' class='searcherFacetedSearchesLabel'></span>" +
 "        </div>" +
 "        <span>" +
-"          <button dojoType='dijit.form.Button' dojoAttachPoint='addFacetedSearch' dojoAttachEvent='onClick:addFacet'></button>" +
+"          <button data-dojo-type='dijit.form.Button' dojoAttachPoint='addFacetedSearch' dojoAttachEvent='onClick:addFacet'></button>" +
 "        </span>" +
 "      </div>" +
 
@@ -74,25 +74,25 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
 "            <div dojoAttachPoint='filters'>" +
 "              <span dojoAttachPoint='searcherFiltersLabel' class='searcherFiltersLabel'></span>" +
 "            </div>" +
-"            <button dojoType='dijit.form.Button' dojoAttachPoint='addFilterButton' dojoAttachEvent='onClick:addFilter'></button>" +
+"            <button data-dojo-type='dijit.form.Button' dojoAttachPoint='addFilterButton' dojoAttachEvent='onClick:addFilter'></button>" +
 "          </td>" +
 "          <td dojoAttachPoint='searcherModifierContainer' class='searcherModifierContainer hide_me' valign='top' width='50%'>" +
 "            <div dojoAttachPoint='modifiers'>" +
 "              <span dojoAttachPoint='searcherModifiersLabel' class='searcherModifiersLabel'></span>" +
 "            </div>" +
-"            <button dojoType='dijit.form.Button' dojoAttachPoint='addModifierButton' dojoAttachEvent='onClick:addModifier'></button>" +
+"            <button data-dojo-type='dijit.form.Button' dojoAttachPoint='addModifierButton' dojoAttachEvent='onClick:addModifier'></button>" +
 "          </td>" +
 "        </tr></tbody></table>" +
 "      </div>" +
 
 "      <div class='searcherGoContainer'>" +
-"        <span dojoType='dijit.form.Button' dojoAttachPoint='goButton' dojoAttachEvent='onClick:performSearch'></span>" +
+"        <span data-dojo-type='dijit.form.Button' dojoAttachPoint='goButton' dojoAttachEvent='onClick:performSearch'></span>" +
 "      </div>" +
 "    </div>" +
 "  </div>" +
 
 "  <div class='searcherDeckSwapContainer'>" +
-"    <span dojoType='dijit.form.Button' dojoAttachPoint='advToggle' dojoAttachEvent='onClick:swapDeck'></span>" +
+"    <span data-dojo-type='dijit.form.Button' dojoAttachPoint='advToggle' dojoAttachEvent='onClick:swapDeck'></span>" +
 "  </div>" +
 "</div>",
             widgetsInTemplate: true,
@@ -363,7 +363,7 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
             templateString :
 '<table dojoAttachPoint="myTop" class="modifier"><tbody><tr>' +
 '   <td>' +
-'     <select value="-" name="modifierSelect" dojoAttachPoint="modifierSelect" dojoType="dijit.form.FilteringSelect" >' +
+'     <select value="-" name="modifierSelect" dojoAttachPoint="modifierSelect" data-dojo-type="dijit.form.FilteringSelect" >' +
 '       <option dojoAttachPoint="modifierDefault" value="-">-- Select a Modifier --</option>' +
 '       <option dojoAttachPoint="modifierAvailable" value="available"></option>' +
 '       <option dojoAttachPoint="modifierDescending" value="descending"></option>' +
@@ -372,7 +372,7 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
 '       <option dojoAttachPoint="modifierStaff" value="staff"></option>' +
 '     </select>' +
 '   </td> ' +
-'   <td dojoAttachPoint="removeWrapper"><span dojoType="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
+'   <td dojoAttachPoint="removeWrapper"><span data-dojo-type="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
 '</tr></tbody></table>',
             widgetsInTemplate: true,
 
@@ -409,7 +409,7 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
             templateString :
 '<table dojoAttachPoint="myTop" class="filter"><tbody><tr>' +
 '   <td>' +
-'     <select value="-" name="filterSelect" dojoAttachPoint="filterSelect" dojoType="dijit.form.FilteringSelect">' +
+'     <select value="-" name="filterSelect" dojoAttachPoint="filterSelect" data-dojo-type="dijit.form.FilteringSelect">' +
 '       <option dojoAttachPoint="filterDefault" value="-">-- Select a Filter --</option>' +
 '       <option dojoAttachPoint="filterSite" value="site">Site</option>' +
 '       <option dojoAttachPoint="filterDepth" value="depth">Search Depth</option>' +
@@ -428,8 +428,8 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
 '       <option dojoAttachPoint="filterBibLevel" value="bib_level">Bibliographic Level</option>' +
 '     </select>' +
 '   </td> ' +
-'   <td><div dojoAttachPoint="valueList" dojoType="dijit.form.TextBox"></div></td> ' +
-'   <td dojoAttachPoint="removeWrapper"><span dojoType="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
+'   <td><div dojoAttachPoint="valueList" data-dojo-type="dijit.form.TextBox"></div></td> ' +
+'   <td dojoAttachPoint="removeWrapper"><span data-dojo-type="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
 '</tr></tbody></table>',
             widgetsInTemplate: true,
 
@@ -475,10 +475,10 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
 
             templateString :
 '<table dojoAttachPoint="myTop" class="facetedSearch"><tbody><tr>' +
-'   <td><div dojoAttachPoint="matchIndex" searchAttr="label" dojoType="dijit.form.FilteringSelect" store="openils.widget.Searcher.facetStore"></div></td> ' +
+'   <td><div dojoAttachPoint="matchIndex" searchAttr="label" data-dojo-type="dijit.form.FilteringSelect" store="openils.widget.Searcher.facetStore"></div></td> ' +
 '   <td><span style="margin-left:10px; margin-right:10px;" dojoAttachPoint="exactOption"></span></td> ' +
-'   <td><div dojoAttachPoint="searchValue" dojoType="dijit.form.TextBox"></div></td> ' +
-'   <td dojoAttachPoint="removeWrapper"><span dojoType="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
+'   <td><div dojoAttachPoint="searchValue" data-dojo-type="dijit.form.TextBox"></div></td> ' +
+'   <td dojoAttachPoint="removeWrapper"><span data-dojo-type="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
 '</tr></tbody></table>',
             widgetsInTemplate: true,
 
@@ -513,16 +513,16 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
             templateString :
 '<table dojoAttachPoint="myTop" class="classedSearch"><tbody><tr>' +
 '   <td colspan="4" align="center"><span dojoAttachPoint="joinerSpan"></span></td></tr><tr> ' +
-'   <td><div dojoAttachPoint="matchIndex" value="keyword" searchAttr="label" dojoType="dijit.form.FilteringSelect" store="openils.widget.Searcher.searchStore"></div></td> ' +
+'   <td><div dojoAttachPoint="matchIndex" value="keyword" searchAttr="label" data-dojo-type="dijit.form.FilteringSelect" store="openils.widget.Searcher.searchStore"></div></td> ' +
 '   <td>' +
-'     <select dojoAttachPoint="matchType" dojoType="dijit.form.FilteringSelect" name="matchType">' +
+'     <select dojoAttachPoint="matchType" data-dojo-type="dijit.form.FilteringSelect" name="matchType">' +
 '       <option dojoAttachPoint="containsOption" value="contains">Contains</option>' +
 '       <option dojoAttachPoint="notContainsOption" value="notcontains">Does Not Contain</option>' +
 '       <option dojoAttachPoint="exactOption" value="exact"> Matches Exactly</option>' +
 '     </select>' +
 '   </td> ' +
-'   <td><div dojoAttachPoint="searchValue" dojoType="dijit.form.TextBox"></div></td> ' +
-'   <td dojoAttachPoint="removeWrapper"><span dojoType="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
+'   <td><div dojoAttachPoint="searchValue" data-dojo-type="dijit.form.TextBox"></div></td> ' +
+'   <td dojoAttachPoint="removeWrapper"><span data-dojo-type="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
 '</tr></tbody></table>',
             widgetsInTemplate: true,
 
diff --git a/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js b/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js
index 5c0be1eb09..ad312d1e4f 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'></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>",
+			templateString : "<span id='${field}_translation_${unique}' dojoAttachPoint='containerNode'><div id='${field}_translation_button_${unique}' dojoAttachPoint='translateLabelNode' data-dojo-type='dijit.form.DropDownButton'><span>Translate</span><div id='${field}_translation_tooltip_${unique}' dojoAttachPoint='tooltipDialog' data-dojo-type='dijit.TooltipDialog'><div data-dojo-type='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/js/ui/default/cat/authority/list.js b/Open-ILS/web/js/ui/default/cat/authority/list.js
index 1d1e4c4bb4..e1726c932c 100644
--- a/Open-ILS/web/js/ui/default/cat/authority/list.js
+++ b/Open-ILS/web/js/ui/default/cat/authority/list.js
@@ -168,13 +168,13 @@ function displayAuthorities(data) {
                     content += "<hr style='width: 100%;' />";
                     content += marcToHTML(auth_rec.marc());
                     content += "</div><hr style='width: 100%;' /><div>";
-                    content += "<input type='button' dojoType='dijit.form.Button' label='" + auth_strings.CANCEL + "' onClick='cancelDelete(" + auth.id + ")'/>";
-                    content += "<input type='button' dojoType='dijit.form.Button' label='" + auth_strings.DELETE + "' onClick='confirmDelete(" + auth.id + ")'/>";
+                    content += "<input type='button' data-dojo-type='dijit.form.Button' label='" + auth_strings.CANCEL + "' onClick='cancelDelete(" + auth.id + ")'/>";
+                    content += "<input type='button' data-dojo-type='dijit.form.Button' label='" + auth_strings.DELETE + "' onClick='confirmDelete(" + auth.id + ")'/>";
                     content += "<input id='viewMARC" + auth.id + "' type='button' "
-                        + "style='float:right;' dojoType='dijit.form.Button' "
+                        + "style='float:right;' data-dojo-type='dijit.form.Button' "
                         + "label='" + auth_strings.VIEW_MARC + "' onClick='viewMARC(" + auth.id + ")'/>";
                     content += "<input id='hideMARC" + auth.id + "' type='button' "
-                        + "style='display: none; float:right;' dojoType='dijit.form.Button' "
+                        + "style='display: none; float:right;' data-dojo-type='dijit.form.Button' "
                         + "label='" + auth_strings.HIDE_MARC + "' onClick='hideMARC(" + auth.id + ")'/>";
                     content += "</div>";
                     delDlg = new dijit.Dialog({
diff --git a/Open-ILS/web/opac/extras/circ/alt_holds_print.html b/Open-ILS/web/opac/extras/circ/alt_holds_print.html
index e1d20338f4..d41e76b151 100644
--- a/Open-ILS/web/opac/extras/circ/alt_holds_print.html
+++ b/Open-ILS/web/opac/extras/circ/alt_holds_print.html
@@ -64,8 +64,8 @@
     <body class='tundra'>
 
         <div style="width: 320px;"
-            dojoType="openils.widget.ProgressDialog"
-            jsId="progress_dialog"></div>
+            data-dojo-type="openils.widget.ProgressDialog"
+            data-dojo-id="progress_dialog"></div>
         <div class="hide_me" id="no_results">No results</div>
         <div class="hide_me" id="clear_holds_deck">
             [ <a id="clear_holds_launcher"
diff --git a/Open-ILS/web/opac/skin/default/xml/common/fonts.xml b/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
index c7ebef3801..2b63d6dbd9 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
@@ -7,8 +7,8 @@
 		<span style='vertical-align: top;'><a href="javascript:void(0);" onclick="setFontSize('large');"> &common.textsize.large; </a></span>
 		<span style='vertical-align: top;'>&nbsp;<span style="font-weight:bold;">|</span>&nbsp;</span>
 		<span style='vertical-align: top;'>&common.language;</span>
-		<span id='translation_switch' dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore"
-            searchAttr="label" required="false" jsId='opacLocaleSelector'>
+		<span id='translation_switch' data-dojo-type="dijit.form.FilteringSelect" store="openils.I18N.localeStore"
+            searchAttr="label" required="false" data-dojo-id='opacLocaleSelector'>
             <script type="text/javascript">
                 dojo.addOnLoad(function() {
                     opacLocaleSelector.setValue(locale);
diff --git a/Open-ILS/web/opac/skin/default/xml/common/holds.xml b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
index ff72572347..76e242992c 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
@@ -137,7 +137,7 @@
 				<tr>
 					<td class='holds_cell'>&opac.holds.expire_time;</td>
 					<td class='holds_cell'>
-                        <input dojoType="dijit.form.DateTextBox" size='10' maxlength='10' id='holds_expire_time' />
+                        <input data-dojo-type="dijit.form.DateTextBox" size='10' maxlength='10' id='holds_expire_time' />
 					</td>
 				</tr>
 
@@ -163,7 +163,7 @@
                         &opac.holds.freeze.thaw_date;
                     </td>
                     <td class='holds_cell'>
-                        <input dojoType="dijit.form.DateTextBox" size='10' maxlength='10' id='holds_frozen_thaw_input' />
+                        <input data-dojo-type="dijit.form.DateTextBox" size='10' maxlength='10' id='holds_frozen_thaw_input' />
                     </td>
                 </tr>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml b/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
index 1638370e78..befff78521 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
@@ -1,7 +1,7 @@
 
 <!-- Searchbar for doing metarecord searches -->
 
-<div id='searchbar' dojoType="openils.widget.Searcher" basicTextBox='search_box'>
+<div id='searchbar' data-dojo-type="openils.widget.Searcher" basicTextBox='search_box'>
     <script type='dojo/method' event='performSearch'>
         this.compileFullSearch();
         dojo.byId(this.basicTextBox).value = this.basic_query;
diff --git a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
index f15fc273dc..0ef3a11941 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
@@ -61,7 +61,7 @@
       <span>&navigate.facetRefine;</span>
 	</div>
 
-     <div dojoType='openils.widget.FacetSidebar' searchBox='facet_box' searchSubmit='search_submit' facetLimit='5' classOrder='["author","subject","series","title","keyword"]'>
+     <div data-dojo-type='openils.widget.FacetSidebar' searchBox='facet_box' searchSubmit='search_submit' facetLimit='5' classOrder='["author","subject","series","title","keyword"]'>
             <script type='dojo/method' event='populate'><![CDATA[
                 var fblob = this;
                 attachEvt("result", "allRecordsReceived", function () {
diff --git a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
index 30ca9a3481..0110781c58 100644
--- a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
+++ b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
@@ -108,8 +108,8 @@
             <!-- locale picker -->
             <tr><td align='center' valign='bottom' style='padding-top:10px;'>
 		        <span style='vertical-align: top;'>&common.language;</span>
-		        <span dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore" 
-                    searchAttr="label" required="false" jsId='opacLocaleSelector'>
+		        <span data-dojo-type="dijit.form.FilteringSelect" store="openils.I18N.localeStore" 
+                    searchAttr="label" required="false" data-dojo-id='opacLocaleSelector'>
                     <script type="text/javascript">
                         dojo.addOnLoad(function() {
                             opacLocaleSelector.setValue(locale);
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
index 5a07d9ed07..bf380fb9b7 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
@@ -29,7 +29,7 @@
     <div id='myopac_holds_thaw_date_form' class='hide_me'>
         <div id='myopac_holds_freeze_select_thaw'>&myopac.holds.freeze.select_thaw;</div>
         <p>
-            <input dojoType="dijit.form.DateTextBox" size='10' maxlength='10' type='text' id='myopac_holds_thaw_date_input' /> 
+            <input data-dojo-type="dijit.form.DateTextBox" size='10' maxlength='10' type='text' id='myopac_holds_thaw_date_input' /> 
         </p>
         <p>
             <button onclick='myopacApplyThawDate();'>&common.submit;</button>
diff --git a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
index f676a72bec..9a787bb340 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
@@ -83,10 +83,10 @@
 
 	<div class='hide_me' id='rdetail_bb_none'>&rdetail.none;</div>
 	<div class='hide_me' id='rdetail_bb_item_success'>&rdetail.bookbag.add.success;</div>
-	<div dojoType='dijit.Dialog' id='newBBDialog' jsId='newBBDialog' title='&rdetail.bookbag.name;' style="width: 20em;">
-        <input id='bbName' jsId='bbName' dojoType='dijit.form.TextBox'></input><br/>
-        <button id='bbok' dojoType='dijit.form.Button' onClick='finishBookbag(0);' type='button'>&common.submit;</button>
-        <button id='bbca' dojoType='dijit.form.Button' onClick='finishBookbag(1);' type='button'>&common.cancel;</button>
+	<div data-dojo-type='dijit.Dialog' id='newBBDialog' data-dojo-id='newBBDialog' title='&rdetail.bookbag.name;' style="width: 20em;">
+        <input id='bbName' data-dojo-id='bbName' data-dojo-type='dijit.form.TextBox'></input><br/>
+        <button id='bbok' data-dojo-type='dijit.form.Button' onClick='finishBookbag(0);' type='button'>&common.submit;</button>
+        <button id='bbca' data-dojo-type='dijit.form.Button' onClick='finishBookbag(1);' type='button'>&common.cancel;</button>
     </div>
 	<div class='hide_me' id='rdetail_bb_success'>&rdetail.bookbag.create.success;</div>
 
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 e54a639c26..7e53016450 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
@@ -74,36 +74,36 @@
     </head>
 
     <body class='tundra tall'>
-        <div dojoType='dijit.layout.LayoutContainer' orientation='vertical' class='tall'>
-            <div dojoType='dijit.layout.ContentPane' layoutAlign='top'>
-                <div id="toolbar1" dojoType="dijit.Toolbar">
+        <div data-dojo-type='dijit.layout.LayoutContainer' orientation='vertical' class='tall'>
+            <div data-dojo-type='dijit.layout.ContentPane' layoutAlign='top'>
+                <div id="toolbar1" data-dojo-type="dijit.Toolbar">
                     <h2>&staff.server.admin.org_unit_settings.title;</h2>
                     
-                    <span dojoType="dijit.ToolbarSeparator" ></span>
+                    <span data-dojo-type="dijit.ToolbarSeparator" ></span>
                     
                     <span>&staff.server.admin.org_unit_settings.context_loc;</span>
-                    <select dojoType='openils.widget.OrgUnitFilteringSelect' jsId='osContextSelector'
+                    <select data-dojo-type='openils.widget.OrgUnitFilteringSelect' data-dojo-id='osContextSelector'
                             searchAttr='shortname' autocomplete='true' labelAttr='shortname' onchange='osChangeContext();' />
                     
-                    <span dojoType="dijit.ToolbarSeparator" ></span>
+                    <span data-dojo-type="dijit.ToolbarSeparator" ></span>
                     
                     <form id='searchform' onSubmit='return doSearch()'>
-                            <input type='text' dojoType='dijit.form.TextBox' id='searchBox' onkeypress='osSearchChange();' />
-                            <button type='submit' dojoType='dijit.form.Button'>&staff.server.admin.org_unit_settings.filter;</button>
-                            <button dojoType='dijit.form.Button' onClick='clearSearch();'>&staff.server.admin.org_unit_settings.clear_filter;</button>
+                            <input type='text' data-dojo-type='dijit.form.TextBox' id='searchBox' onkeypress='osSearchChange();' />
+                            <button type='submit' data-dojo-type='dijit.form.Button'>&staff.server.admin.org_unit_settings.filter;</button>
+                            <button data-dojo-type='dijit.form.Button' onClick='clearSearch();'>&staff.server.admin.org_unit_settings.clear_filter;</button>
                     </form>
                     
-                    <span dojoType="dijit.ToolbarSeparator" ></span>
+                    <span data-dojo-type="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>
+                    <button data-dojo-type='dijit.form.Button' onClick='osToJson();'>&staff.server.admin.org_unit_settings.export;</button>
+                    <button data-dojo-type='dijit.form.Button' onClick='osFromJson();'>&staff.server.admin.org_unit_settings.import;</button>
                 </div>
                 <span>&staff.server.admin.org_unit_settings.uninherited;</span>
             </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client'>
                 <div class='hide_me' id='no-perms'><b>&staff.server.admin.org_unit_settings.no_perms;</b></div>
             </div>
-            <div dojoType="dijit.layout.ContentPane" layoutAlign='client' class='tall'>
+            <div data-dojo-type="dijit.layout.ContentPane" layoutAlign='client' class='tall'>
                 <script>
                     var osGridLayout = [{
                         defaultCell: {styles: 'text-align: center;'},
@@ -125,12 +125,12 @@
                         ]]
                     }];
                 </script>
-                <div dojoType='dojox.Grid' jsId='osGrid' ></div>
+                <div data-dojo-type='dojox.Grid' data-dojo-id='osGrid' ></div>
             </div>
         </div>
 
         <!-- edit dialog -->
-        <div dojoType="dijit.Dialog" jsId='osEditDialog' title="&staff.server.admin.org_unit_settings.edit_setting;">
+        <div data-dojo-type="dijit.Dialog" data-dojo-id='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'></div></td></tr>
@@ -140,17 +140,17 @@
                     <tr>
                         <td>&staff.server.admin.org_unit_settings.context;</td>
                         <td> 
-                            <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='osEditContextSelector'
+                            <select data-dojo-type="openils.widget.OrgUnitFilteringSelect" data-dojo-id='osEditContextSelector'
                                 searchAttr="shortname" autocomplete="true" labelAttr='shortname' />
                         </td>
                     </tr>
                     <tr>
                         <td>&staff.server.admin.org_unit_settings.value;</td>
                         <td>
-                            <input dojoType='dijit.form.TextBox' jsId='osEditTextBox'/>
-                            <input dojoType='dijit.form.CurrencyTextBox' jsId='osEditCurrencyTextBox'/>
-                            <input dojoType='dijit.form.NumberTextBox' jsId='osEditNumberTextBox'/>
-                            <select dojoType='dijit.form.FilteringSelect' jsId='osEditBoolSelect'>
+                            <input data-dojo-type='dijit.form.TextBox' data-dojo-id='osEditTextBox'/>
+                            <input data-dojo-type='dijit.form.CurrencyTextBox' data-dojo-id='osEditCurrencyTextBox'/>
+                            <input data-dojo-type='dijit.form.NumberTextBox' data-dojo-id='osEditNumberTextBox'/>
+                            <select data-dojo-type='dijit.form.FilteringSelect' data-dojo-id='osEditBoolSelect'>
                                 <option value='true'>&common.true;</option>
                                 <option value='false'>&common.false;</option>
                             </select>
@@ -159,17 +159,17 @@
                     </tr>
                     <tr>
                         <td> 
-                            <button dojoType='dijit.form.Button' onclick='osEditSetting(true);'>&staff.server.admin.org_unit_settings.delete_setting;</button>
+                            <button data-dojo-type='dijit.form.Button' onclick='osEditSetting(true);'>&staff.server.admin.org_unit_settings.delete_setting;</button>
                         </td>
                         <td> 
-                            <button dojoType='dijit.form.Button' onclick='osEditSetting();'>&staff.server.admin.org_unit_settings.update_setting;</button>
+                            <button data-dojo-type='dijit.form.Button' onclick='osEditSetting();'>&staff.server.admin.org_unit_settings.update_setting;</button>
                         </td>
                     </tr>
                 </tbody>
             </table>
         </div> <!-- /edit dialog -->
         
-        <div dojoType="openils.widget.ProgressDialog" jsId="progressDialog" indeterminate="true" ></div>
+        <div data-dojo-type="openils.widget.ProgressDialog" data-dojo-id="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>
@@ -181,25 +181,25 @@
         <span id='os-not-chosen' class='hidden'>&staff.server.admin.org_unit_settings.not_chosen;</span>
         
         <!--Export Dialog-->
-        <div id='jsonOutputDialog' dojoType='dijit.Dialog' jsId='osJSONOutDialog' title='&staff.server.admin.org_unit_settings.export;'>
+        <div id='jsonOutputDialog' data-dojo-type='dijit.Dialog' data-dojo-id='osJSONOutDialog' title='&staff.server.admin.org_unit_settings.export;'>
             <table class='form_table'>
                 <tr><td>&staff.server.admin.org_unit_settings.export_copy_label;</td></tr>
                 <tr><td><textarea id='jsonOutput' /></td></tr>
-                <tr><td><button dojoType='dijit.form.Button' onclick='osJsonOutputCopy();'>&staff.server.admin.org_unit_settings.copy;</button></td></tr>
+                <tr><td><button data-dojo-type='dijit.form.Button' onclick='osJsonOutputCopy();'>&staff.server.admin.org_unit_settings.copy;</button></td></tr>
             </table>
         </div>
         
         <!--Import Dialog-->
-        <div id='jsonInputDialog' dojoType='dijit.Dialog' jsId='osJSONInDialog' title='&staff.server.admin.org_unit_settings.import;'>
+        <div id='jsonInputDialog' data-dojo-type='dijit.Dialog' data-dojo-id='osJSONInDialog' title='&staff.server.admin.org_unit_settings.import;'>
             <table class='form_table'>
                 <tr><td>&staff.server.admin.org_unit_settings.import_paste_label;</td></tr>
                 <tr><td><textarea id='jsonInput' /></td></tr>
-                <tr><td><button dojoType='dijit.form.Button' onclick='osJsonInputPaste();'>&staff.server.admin.org_unit_settings.paste;</button><button type='submit'  dojoType='dijit.form.Button' onclick='osFromJsonSubmit();'>&staff.server.admin.org_unit_settings.submit;</button></td></tr>
+                <tr><td><button data-dojo-type='dijit.form.Button' onclick='osJsonInputPaste();'>&staff.server.admin.org_unit_settings.paste;</button><button type='submit'  data-dojo-type='dijit.form.Button' onclick='osFromJsonSubmit();'>&staff.server.admin.org_unit_settings.submit;</button></td></tr>
             </table>
         </div>
         
         <!--History Dialog-->
-        <div id="historyDialog" dojoType="dijit.Dialog" jsId="osHistDialog" title="&staff.server.admin.org_unit_settings.history;">
+        <div id="historyDialog" data-dojo-type="dijit.Dialog" data-dojo-id="osHistDialog" title="&staff.server.admin.org_unit_settings.history;">
             <span id='osHistName' ></span>
             
             <!--Headers grabbed from this table are put in the next one by the js.-->
-- 
2.11.0