[open-ils-commits] [GIT] Evergreen ILS branch rel_3_2 updated. 343a2f8068542665df7e5e2bcdb5eb37d8459698
Evergreen Git
git at git.evergreen-ils.org
Thu Mar 14 10:02:30 EDT 2019
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, rel_3_2 has been updated
via 343a2f8068542665df7e5e2bcdb5eb37d8459698 (commit)
via c30d8d45c469174b047a14407c950cec96c2f4a7 (commit)
via 816b16492bf4d6ff4cdaf34a287ee321763ef7a4 (commit)
from de32afd744a7bdefd1418da7da503d4a9d8f508d (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 343a2f8068542665df7e5e2bcdb5eb37d8459698
Author: Bill Erickson <berickxx at gmail.com>
Date: Tue Mar 5 11:53:09 2019 -0500
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 at gmail.com>
Signed-off-by: Elaine Hardy <ehardy at georgialibraries.org>
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 0ea927ad69..d517d5bc2e 100644
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -217,3 +217,11 @@ grid[name="-none-"] * label { color: black; }
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;
+}
+
commit c30d8d45c469174b047a14407c950cec96c2f4a7
Author: Bill Erickson <berickxx at gmail.com>
Date: Tue Mar 5 11:10:44 2019 -0500
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 at gmail.com>
Signed-off-by: Elaine Hardy <ehardy at georgialibraries.org>
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 da038b6e4d..426b2bbb5a 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 9af6bd73b8..0ea927ad69 100644
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -198,3 +198,22 @@ grid[name="-none-"] * label { color: black; }
white-space: nowrap;
}
+.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;
+}
+
commit 816b16492bf4d6ff4cdaf34a287ee321763ef7a4
Author: Bill Erickson <berickxx at gmail.com>
Date: Fri Feb 8 11:25:10 2019 -0500
LP1739293 Record merge horizontal; optional holdings
* Tile bib records horizontally in record bucket => merge records
interface.
* Add a "Toggle Holdings View" button for displaying holdings and leave
holdings un-displayed by default.
* Duplicate the Merge and Cancel buttons along the top of the dialog.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Elaine Hardy <ehardy at georgialibraries.org>
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 255d85f5aa..da038b6e4d 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
@@ -5,45 +5,62 @@
<h4 class="modal-title">[% l('Merge records?') %]</h4>
</div>
<div class="modal-body">
- <div class="row">
+ <div class="row pad-all-min">
<div class="col-xs-3">
<label for="merge_profile_selector">[% l('Choose merge profile') %]</label>
<eg-fm-value-selector id="merge_profile_selector" ng-model="merge_profile" idl-class="vmp" ou-setting="cat.default_merge_profile" filter="{'preserve_spec':{'=':null}}" sticky-setting="eg.cat.record_bucket.default_merge_profile"></eg-fm-value-selector>
</div>
- </div>
- <div class="row">
- <div class="col-xs-6">
- <h4>[% l('Lead record') %]</h4>
- <div ng-if="lead_id">
- <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" marc-xml="lead.marc_xml"
- in-place-mode="true"
- record-type="bre" flat-only="true" embedded="true"
- ng-show="editing_inplace" on-save="post_edit_inplace">
- </eg-marc-edit-record>
- <eg-record-breaker record-id="lead_id" marc-xml="lead.marc_xml" ng-show="!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...') %]
- </div>
+ <div class="col-xs-2">
+ <button class="btn btn-default" ng-click="showHoldings=!showHoldings">
+ [% l('Toggle Holdings Display') %]</button>
+ </div>
+ <div class="col-xs-3">
+ <div ng-if="!lead_id" class="alert alert-info">
+ [% l('Please select a lead record') %]
</div>
- <div class="col-xs-6">
- <h4>[% l('Records to merge into lead') %]</h4>
- <tabset>
- <tab heading="[% l('Bib [_1]', '{{rec.id}}') %]" 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" 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" edit-copies="true" edit-volumes="true"></eg-volume-list>
- </tab>
- </tabset>
+ </div>
+ <div class="col-xs-4 flex-row">
+ <!-- pull-right not working, push the action buttons to
+ the right via flex -->
+ <div class="flex-2"></div>
+ <div>
+ <input type="submit" ng-click="ok()"
+ ng-class="{disabled : !lead_id || records.length < 1 }"
+ class="btn btn-primary" value="[% l('Merge') %]"/>
+ <button class="btn btn-warning" ng-click="cancel()">[% l('Cancel') %]</button>
</div>
+ </div>
+ </div>
+
+ <div class="flex-row" style="overflow:scroll">
+ <div ng-if="lead_id" class="flex-1">
+ <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" marc-xml="lead.marc_xml"
+ in-place-mode="true"
+ record-type="bre" flat-only="true" embedded="true"
+ ng-show="editing_inplace" on-save="post_edit_inplace">
+ </eg-marc-edit-record>
+ <eg-record-breaker record-id="lead_id" marc-xml="lead.marc_xml"
+ ng-show="!editing_inplace"></eg-record-breaker>
+ <eg-volume-list ng-if="showHoldings" record-id="lead_id"
+ edit-copies="true" edit-volumes="true"></eg-volume-list>
+ </tab>
+ </tabset>
+ </div>
+ <div class="flex-1" 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"
+ ng-click="drop(rec)">[% l('Remove from consideration') %]</button>
+ <eg-record-breaker record-id="rec.id"></eg-record-breaker>
+ <eg-volume-list ng-if="showHoldings" record-id="rec.id"
+ edit-copies="true" edit-volumes="true"></eg-volume-list>
+ </div>
</div>
</div>
<div class="modal-footer">
diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
index aebfb25165..769f9f8bbb 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
@@ -571,6 +571,7 @@ function($scope, $q , $routeParams, bucketSvc, egCore, $window,
$scope.merge_profile = null;
$scope.lead = { marc_xml : null };
$scope.editing_inplace = false;
+ $scope.showHoldings = false;
angular.forEach(records, function(rec) {
$scope.records.push({ id : rec.id });
});
-----------------------------------------------------------------------
Summary of changes:
.../staff/cat/bucket/record/t_merge_records.tt2 | 84 +++++++++++++---------
Open-ILS/src/templates/staff/css/cat.css.tt2 | 27 +++++++
.../js/ui/default/staff/cat/bucket/record/app.js | 1 +
3 files changed, 79 insertions(+), 33 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list