From b03c3675e9c66228ab04d9191602a3bb76be3677 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 21 Mar 2016 12:32:19 -0400
Subject: [PATCH] JBAS-1185 Patron edit missing 2.7 2ndry grps button

Add the missing button to the KCLS template.  Also, remove the local
copy of the register.tt2 file, since it contained no local
customizations.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../var/templates_kcls/actor/user/register.tt2     | 82 ----------------------
 .../templates_kcls/actor/user/register_table.tt2   |  9 ++-
 2 files changed, 8 insertions(+), 83 deletions(-)
 delete mode 100644 KCLS/openils/var/templates_kcls/actor/user/register.tt2

diff --git a/KCLS/openils/var/templates_kcls/actor/user/register.tt2 b/KCLS/openils/var/templates_kcls/actor/user/register.tt2
deleted file mode 100644
index f1e96e4749..0000000000
--- a/KCLS/openils/var/templates_kcls/actor/user/register.tt2
+++ /dev/null
@@ -1,82 +0,0 @@
-[% ctx.page_title = l('User Editor') %]
-[% WRAPPER base.tt2 %]
-<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="">
-    <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. */
-        return false;
-    </script>
-    <table>
-        [% INCLUDE actor/user/register_table.tt2 %]
-    </table>
-</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>
-    <div id='require-toggle'>
-        <a href='javascript:uEditToggleRequired(1);' id='uedit-show-required'>[% l('Show Only Required Fields') %]</a><br id='uedit-show-required-br'/>
-        <a href='javascript:uEditToggleRequired(2);' id='uedit-show-suggested'>[% l('Show Suggested Fields') %]</a><br id='uedit-show-suggested-br'/>
-        <a href='javascript:uEditToggleRequired(0);' id='uedit-show-all' class='hidden'>[% l('Show All Fields') %]</a>
-    </div>
-</div>
-
-<!-- context help widget -->
-<a class='hidden' id='uedit-help-template'><img src='/opac/images/advancedsearch-icon.png'></img></a>
-<fieldset id='uedit-help-div' class='hidden'>
-    <legend id='uedit-help-field'></legend>
-    <div id='uedit-help-text'></div>
-</fieldset>
-
-<!-- duplicate patron search results -->
-<div id='uedit-dupe-div' class='hidden'>
-    <div><a href='javascript:void(0);' id='uedit-dupe-names-link'></a></div>
-    <div><a href='javascript:void(0);' id='uedit-dupe-email-link'></a></div>
-    <div><a href='javascript:void(0);' id='uedit-dupe-ident-link'></a></div>
-    <div><a href='javascript:void(0);' id='uedit-dupe-phone-link'></a></div>
-    <div><a href='javascript:void(0);' id='uedit-dupe-address-link'></a></div>
-</div>
-
-<div id='uedit-address-alert' class='hidden'>
-    <div id='uedit-address-alert-header'>[% l('Address Alert') %]</div>
-    <div id='uedit-address-alert-message'></div>
-</div>
-
-<div class='hidden'>
-    <div jsId="progressDialog" dojoType="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'>
-        <table class='oils-generic-table' style='margin:10px;'>
-            <thead>
-                <tr>
-                    <th id='uedit-all-cards-barcode'>[% l('Barcode') %]</th>
-                    <th id='uedit-all-cards-active'>[% l('Active') %]</th>
-                    <th id='uedit-all-cards-primary'>[% l('Primary') %]</th>
-                </tr>
-            </thead>
-            <tbody id='uedit-all-cards-tbody'>
-                <tr id='uedit-all-cards-tr-template'>
-                    <td><div name='barcode'></div></td>
-                    <td><div name='active'></div></td>
-                    <td><div name='primary'></div></td>
-                </tr>
-            </tbody>
-            <tbody>
-                <tr>
-                    <td colspan='3' style='text-align:center;'>
-                        <button jsId='allCardsClose' dojoType='dijit.form.Button' onClick='allCardsDialog.hide()' scrollOnFocus='false'>[% l('Close') %]</button>
-                        <span id='uedit-apply-card-changes'><button jsId='allCardsApply' dojoType='dijit.form.Button' onClick='applyCardChanges()' scrollOnFocus='false'>[% l('Apply Changes') %]</button></span>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-</div>
-
-
-[% END %]
-
diff --git a/KCLS/openils/var/templates_kcls/actor/user/register_table.tt2 b/KCLS/openils/var/templates_kcls/actor/user/register_table.tt2
index e744f0eb71..c4dec44425 100644
--- a/KCLS/openils/var/templates_kcls/actor/user/register_table.tt2
+++ b/KCLS/openils/var/templates_kcls/actor/user/register_table.tt2
@@ -56,7 +56,14 @@
     <tr fmclass='au' fmfield='email'/>
     <tr fmclass='au' fmfield='ident_value2' required='required'><td/><td id='parentGuardian'></td></tr>
     <tr fmclass='au' fmfield='home_ou' required='required'/>
-    <tr fmclass='au' fmfield='profile' required='required'/>
+    <tr fmclass='au' fmfield='profile' required='required'>
+        <td/><td/><td/>
+        <td>
+            <span class="hidden" id="ueditSecondaryGrpButton">
+                <button dojoType='dijit.form.Button' jsId='secondaryGroupsButton' scrollOnFocus='false' tabIndex='-1'>[% l('Secondary Groups') %]</b
+            </span>
+        </td>
+    </tr>
     <tr fmclass='au' fmfield='expire_date' required='required'>
         <td/><td/><td/>
         <td>
-- 
2.11.0