From 48146678b1595e560583fc2490087091bd1a31ad Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Thu, 8 Oct 2015 16:43:42 +0000
Subject: [PATCH] webstaff: tweak layout of the merge interface

The lead record is now displayed using the same sort
of tabset as the subordinate records. While, of course,
there can be only one lead record at a time, doing it
this way gives us two things:

[1] Display of the lead bib's ID
[2] Better vertical alignment of the MARC records

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../cat/bucket/record/t_merge_records.tt2     | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2
index 3e9fa6e139..76e64097a2 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2
@@ -9,14 +9,18 @@
           <div class="col-xs-6">
             <h4>[% l('Lead record') %]</h4>
             <div ng-if="lead_id">
-               <button class="btn btn-default btn-sm" ng-class="{disabled : editing_inplace}" ng-click="edit_lead_inplace()">[% l('Edit') %]</button>
-               <button class="btn btn-default btn-sm" ng-class="{disabled : editing_inplace}" ng-click="edit_lead()">[% l('Edit using full editor') %]</button>
-               <eg-marc-edit-record dirty-flag="dirty_flag" record-id="lead_id"
-                         record-type="bre" flat-only="true" embedded="true" 
-                         ng-if="editing_inplace" on-save="post_edit_inplace">
-               </eg-marc-edit-record>
-               <eg-record-breaker record-id="lead_id" ng-if="!editing_inplace"></eg-record-breaker>
-               <eg-volume-list record-id="lead_id" edit-copies="true" edit-volumes="true"></eg-volume-list>
+               <tabset>
+                 <tab heading="[% l('Bib [_1]', '{{lead_id}}') %]">
+                   <button class="btn btn-default btn-sm" ng-class="{disabled : editing_inplace}" ng-click="edit_lead_inplace()">[% l('Edit') %]</button>
+                   <button class="btn btn-default btn-sm" ng-class="{disabled : editing_inplace}" ng-click="edit_lead()">[% l('Edit using full editor') %]</button>
+                   <eg-marc-edit-record dirty-flag="dirty_flag" record-id="lead_id"
+                             record-type="bre" flat-only="true" embedded="true" 
+                             ng-if="editing_inplace" on-save="post_edit_inplace">
+                   </eg-marc-edit-record>
+                   <eg-record-breaker record-id="lead_id" ng-if="!editing_inplace"></eg-record-breaker>
+                   <eg-volume-list record-id="lead_id" edit-copies="true" edit-volumes="true"></eg-volume-list>
+                 </tab>
+               </tabset>
             </div>
             <div ng-if="!lead_id">
                 [% l('Please select a lead record from the right...') %]
@@ -29,8 +33,7 @@
                 <button class="btn btn-default btn-sm" ng-click="use_as_lead(rec)">[% l('Use as lead record') %]</button>
                 <button class="btn btn-default btn-sm" ng-click="drop(rec)">[% l('Remove from consideration') %]</button>
                 <eg-record-breaker record-id="rec.id"></eg-record-breaker>
-                <eg-volume-list record-id="rec.id"></eg-volume-list>
-               <eg-volume-list record-id="rec.id" edit-copies="true" edit-volumes="true"></eg-volume-list>
+                <eg-volume-list record-id="rec.id" edit-copies="true" edit-volumes="true"></eg-volume-list>
               </tab>
             </tabset>
           </div>
-- 
2.43.2