From d2ad575a275a7d138627a14612bb461325aa8c0f Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 5 Mar 2019 11:10:44 -0500
Subject: [PATCH] LP1739293 Record merge fits container

Allow the text contents of each merged MARC record to wrap so the
records may fit horizontally on the screen.  A single vertical scroll
allows the user to scroll down to see any parts of the record that
require more vertical space.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Elaine Hardy <ehardy@georgialibraries.org>
---
 .../staff/cat/bucket/record/t_merge_records.tt2    |    2 +-
 Open-ILS/src/templates/staff/css/cat.css.tt2       |   21 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 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 da038b6..426b2bb 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
@@ -52,7 +52,7 @@
             </tab>
           </tabset>
         </div>
-        <div class="flex-1" ng-repeat="rec in records">
+        <div class="record-merge-container" ng-repeat="rec in records">
           <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" 
diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2
index ccb2847..9d04e00 100644
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -260,5 +260,24 @@ table.custom-label-table td {
 .cn-template-text {
   height: 12em;
   width: 100%;
-  }
+}
+
+.record-merge-container {
+  flex: 1;
+  max-height: 600px;
+  /*
+   * LP1739293 Leaving for reference in case anyone wants to allow the
+   * marc records to occupy more horizontal space and/or put scroll bars
+   * on the individual records instead of a single vertical scroll.
+  min-width: 600px;
+  max-width: 900px;
+  overflow-y: scroll;
+  */
+}
+
+.record-merge-container pre {
+  /* in the merge view, wrap text so it doesn't gobble up 
+   * all of the horizontal space */
+  white-space: pre-wrap;
+}
 
-- 
1.7.2.5