From ac8647e5ec00c5446cd9258a8866780c709122af Mon Sep 17 00:00:00 2001
From: McCanna <tmccanna@georgialibraries.org>
Date: Mon, 5 Nov 2018 13:18:46 -0500
Subject: [PATCH] PINES Cust: Fix layout for Patron Edit Form

Readjustments to previous customizations that no longer work
properly with 3.2. Also added links to relevant documentation.

Signed-off-by: McCanna <tmccanna@georgialibraries.org>
---
 .../src/templates/staff/circ/patron/reg_actions.tt2 |  4 ++++
 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 | 21 +++------------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/patron/reg_actions.tt2 b/Open-ILS/src/templates/staff/circ/patron/reg_actions.tt2
index 76414f9468..13245af36b 100644
--- a/Open-ILS/src/templates/staff/circ/patron/reg_actions.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/reg_actions.tt2
@@ -17,6 +17,10 @@
       <a href 
         ng-class="{disabled : edit_passthru.vis_level == 0}"
         ng-click="edit_passthru.vis_level=0">[% l('All Fields') %]</a>
+    </span> | 
+	<span class="pad-all-min">
+      <a href="https://pines.georgialibraries.org/dokuwiki/doku.php?id=circ:accounts:reg_field_desc" 
+        target="_blank"  style="font-weight:bold;color:#379676;">PINES Field Documentation</a>
     </span>
   </span>
 </div>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index 60c8539165..28908a63e0 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -376,7 +376,6 @@ within the "form" by name for validation.
   </div>
   <div class="col-md-6 patron-reg-example">
     [% draw_example_text('au', 'dob') %]
-    <span>Example: 09/15/1980</span>
   </div>
 </div>
 
@@ -385,7 +384,6 @@ within the "form" by name for validation.
 <div class="row reg-field-row" ng-show="show_field('au.juvenile')">
   [% draw_field_label('au', 'juvenile') %]
   <div class="col-md-3 reg-field-input">
-    <div class='checkbox' style="margin-left:20px;">
       <input 
         ng-change="field_modified()" 
         ng-blur="handle_field_changed(patron, 'juvenile')"
@@ -415,7 +413,8 @@ within the "form" by name for validation.
   [% draw_form_input('au', 'ident_value') %]
   <div class="col-md-6 patron-reg-example">
     [% draw_example_text('au', 'ident_value') %]
-    <span>Example: GA-123456789</span>
+    <span>Example: GA-123456789 <a href="https://pines.georgialibraries.org/dokuwiki/doku.php?id=circ:accounts:reg_field_desc#idformats"
+	    target="_blank">(see more examples)</a></span>
   </div>
 </div>
 
@@ -436,19 +435,10 @@ within the "form" by name for validation.
 
 <!-- IDENT_VALUE2 -->
 <div class="row reg-field-row" ng-show="show_field('au.ident_value2')">
-  <!-- PINES Customization: Relabel field -->
-  <div class="col-md-3 reg-field-label">
-      <!--field label -->
-      <label class="ng-binding">Parent/Guardian</label>
-      <!--field documentation img/link-->
-      <img class="ng-hide" ng-show="field_doc.au.ident_value2" ng-click="set_selected_field_doc('au','ident_value2')" src="/images/question-mark.png">
-  </div>
+  [% draw_field_label('au', 'ident_value2') %]
   [% draw_form_input('au', 'ident_value2') %]
   <div class="col-md-6 patron-reg-example">
     [% draw_example_text('au', 'ident_value2') %]
-    <div ng-show="parent_alert" class="patron-reg-validation-alert">
-        <span>Parent/Guardian is Required (Ex: Jane Smith - Mom)</span>
-    </div>
   </div>
 </div>
 
@@ -614,7 +604,6 @@ within the "form" by name for validation.
 <div class="row reg-field-row" ng-show="show_field('au.active')">
   [% draw_field_label('au', 'active') %]
   <div class="col-md-3 reg-field-input">
-    <div class='checkbox' style="margin-left:20px;">
       <input 
         ng-change="field_modified()" 
         ng-blur="handle_field_changed(patron, 'active')"
@@ -628,7 +617,6 @@ within the "form" by name for validation.
 <div class="row reg-field-row" ng-show="show_field('au.barred')">
   [% draw_field_label('au', 'barred') %]
   <div class="col-md-3 reg-field-input">
-    <div class='checkbox' style="margin-left:20px;">
       <input 
         ng-change="field_modified()" 
         ng-blur="handle_field_changed(patron, 'barred')"
@@ -642,7 +630,6 @@ within the "form" by name for validation.
 <div class="row reg-field-row" ng-show="show_field('au.master_account')">
   [% draw_field_label('au', 'master_account') %]
   <div class="col-md-3 reg-field-input">
-    <div class='checkbox' style="margin-left:20px;">
       <input 
         ng-change="field_modified()" 
         ng-blur="handle_field_changed(patron, 'master_account')"
@@ -967,7 +954,6 @@ within the "form" by name for validation.
   <div class="row reg-field-row" ng-show="show_field('aua.valid')">
     [% draw_field_label('aua', 'valid') %]
     <div class="col-md-3 reg-field-input">
-      <div class='checkbox' style="margin-left:20px;">
         <input 
           type='checkbox' 
           ng-change="field_modified()" 
@@ -985,7 +971,6 @@ within the "form" by name for validation.
   <div class="row reg-field-row" ng-show="show_field('aua.within_city_limits')">
     [% draw_field_label('aua', 'within_city_limits') %]
     <div class="col-md-3 reg-field-input">
-      <div class='checkbox' style="margin-left:20px;">
         <input 
           type='checkbox' 
           ng-change="field_modified()" 
-- 
2.11.0