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

[Evergreen Git]

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

The branch, master has been updated
       via  afbda31bf6ffb065f3c1b1c85c0caddc0fcbc583 (commit)
      from  6db854d8612f44cff2a18b5b4ca52395d0992d37 (commit)

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

- Log -----------------------------------------------------------------
commit afbda31bf6ffb065f3c1b1c85c0caddc0fcbc583
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Nov 15 16:34:02 2016 -0500

    webstaff: add template for patron merge dialog
    
    This had been skipped by mistake.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/templates/staff/circ/share/t_merge_patrons.tt2 b/Open-ILS/src/templates/staff/circ/share/t_merge_patrons.tt2
new file mode 100644
index 0000000..f498f60
--- /dev/null
+++ b/Open-ILS/src/templates/staff/circ/share/t_merge_patrons.tt2
@@ -0,0 +1,32 @@
+<div>
+  <div class="modal-header">
+    <button type="button" class="close"
+      ng-click="cancel()" aria-hidden="true">×</button>
+    <h4 class="modal-title">[% l('Merge patrons?') %]</h4>
+  </div>
+  <div class="modal-body">
+      <div class="row">
+          
+          <div class="col-xs-6">
+            <label>
+              <input type="radio" name="lead_record" ng-model="lead_id" ng-value="patron_ids[0]"/></input>
+              [% l('Use as lead') %]
+            </label>
+            <eg-patron-summary patron-id="patron_ids[0]"></eg-patron-summary>
+          </div>
+          <div class="col-xs-6">
+            <label>
+              <input type="radio" name="lead_record" ng-model="lead_id" ng-value="patron_ids[1]"/></input>
+              [% l('Use as lead') %]
+            </label>
+            <eg-patron-summary patron-id="patron_ids[1]"></eg-patron-summary>
+          </div>
+      </div>
+  </div>
+  <div class="modal-footer">
+    <input type="submit" ng-click="ok()"
+        ng-class="{disabled : !lead_id }"
+        class="btn btn-primary" value="[% l('Merge') %]"/>
+    <button class="btn btn-warning" ng-click="cancel()">[% l('Cancel') %]</button>
+  </div>
+</div>

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

Summary of changes:
 .../templates/staff/circ/share/t_merge_patrons.tt2 |   32 ++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)
 create mode 100644 Open-ILS/src/templates/staff/circ/share/t_merge_patrons.tt2


hooks/post-receive
-- 
Evergreen ILS