From df8973b3a98c84881544f340b0b5e4373f705822 Mon Sep 17 00:00:00 2001 From: Bill Erickson <berickxx@gmail.com> Date: Tue, 5 Mar 2019 11:53:09 -0500 Subject: [PATCH] LP1739293 Record merged edit-in-place avoid wrap When using the inline editor, prevent text wrapping and instead allow the text to overflow x and y and use scrolls to navigate. Signed-off-by: Bill Erickson <berickxx@gmail.com> Signed-off-by: Elaine Hardy <ehardy@georgialibraries.org> --- .../src/templates/staff/cat/bucket/record/t_merge_records.tt2 | 3 ++- Open-ILS/src/templates/staff/css/cat.css.tt2 | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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 426b2bbb5a..1a5ee26272 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 @@ -33,7 +33,8 @@ </div> <div class="flex-row" style="overflow:scroll"> - <div ng-if="lead_id" class="flex-1"> + <div ng-if="lead_id" + ng-class="{'record-merge-container': !editing_inplace, 'record-edit-container': editing_inplace}"> <tabset> <tab heading="[% l('Bib [_1]', '{{lead_id}}') %]"> <button class="btn btn-default btn-sm" ng-class="{disabled : editing_inplace}" diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2 index 9d04e009ab..cbbdfbaadf 100644 --- a/Open-ILS/src/templates/staff/css/cat.css.tt2 +++ b/Open-ILS/src/templates/staff/css/cat.css.tt2 @@ -281,3 +281,11 @@ table.custom-label-table td { white-space: pre-wrap; } +/* Avoid word wrapping in edit mode and add scrolls for navigation */ +.record-edit-container { + flex: 1; + overflow-x: scroll; + overflow-y: scroll; + white-space: nowrap; +} + -- 2.11.0