[open-ils-commits] [GIT] Evergreen ILS branch rel_3_5 updated. a1ef32532714753bf568408dedddb1026d6e6135
Evergreen Git
git at git.evergreen-ils.org
Thu Jul 30 09:46:55 EDT 2020
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_5 has been updated
via a1ef32532714753bf568408dedddb1026d6e6135 (commit)
via 7f14d09634fb9e631621c06033075533e37c680b (commit)
via 187100f24a9354b407a598266c15c3f6cf9b3663 (commit)
from 0eabb01710b738cce91e0c57e49652ea20f7e842 (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 a1ef32532714753bf568408dedddb1026d6e6135
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Mon Oct 8 17:24:20 2018 -0700
LP1731370: Distinguishing new copies and volumes with aditional means (WCAG 1.4.1)
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Elaine Hardy <ehardy at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/index.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
index d50b450980..a8e4b75c56 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
@@ -13,6 +13,8 @@
<script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/record.js"></script>
<script>
angular.module('egCoreMod').run(['egStrings', function(s) {
+ s.VOL_COPY_NEW_ITEM = "[% l('Newly created item') %]";
+ s.VOL_COPY_NEW_CALL_NUMBER = "[% l('Newly created call number') %]";
s.VOL_COPY_TEMPLATE_SUCCESS_SAVE = "[% l('Saved holdings template(s)') %]";
s.VOL_COPY_TEMPLATE_SUCCESS_DELETE = "[% l('Deleted holdings template') %]";
s.SHORT = "[% l('Short') %]";
diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2
index ce076d5bac..5c475a935f 100644
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -330,5 +330,4 @@ table.custom-label-table td {
white-space: nowrap;
}
-.new-cn { background-color: lightgreen; }
-.new-cp { background-color: lightgreen; }
+.new-cn, .new-cp { background-color: lightgreen; border:1px dashed #000; }
diff --git a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
index 9898136d75..966ec40b65 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -481,12 +481,13 @@ function(egCore , $q) {
return service;
}])
-.directive("egVolCopyEdit", function () {
+.directive("egVolCopyEdit", ['egCore', function (egCore) {
return {
restrict: 'E',
replace: true,
template:
'<div class="row" ng-class="{'+"'new-cp'"+':is_new}">'+
+ '<span ng-if="is_new" class="sr-only">' + egCore.strings.VOL_COPY_NEW_ITEM + '</span>' +
'<div class="col-xs-5" ng-class="{'+"'has-error'"+':barcode_has_error}">'+
'<input id="{{callNumber.id()}}_{{copy.id()}}"'+
' eg-enter="nextBarcode(copy.id())" class="form-control"'+
@@ -590,15 +591,16 @@ function(egCore , $q) {
]
}
-})
+}])
-.directive("egVolRow", function () {
+.directive("egVolRow", ['egCore', function (egCore) {
return {
restrict: 'E',
replace: true,
transclude: true,
template:
'<div class="row" ng-class="{'+"'new-cn'"+':!callNumber.not_ephemeral}">'+
+ '<span ng-if="!callNumber.not_ephemeral()" class="sr-only">' + egCore.strings.VOL_COPY_NEW_CALL_NUMBER + '</span>' +
'<div class="col-xs-2">'+
'<button aria-label="Delete" style="margin:-5px -15px; float:left;" ng-hide="callNumber.not_ephemeral" type="button" class="close" ng-click="removeCN()">×</button>' +
'<select class="form-control" ng-model="classification" ng-change="updateClassification()" ng-options="cl.name() for cl in classification_list"></select>'+
@@ -838,7 +840,7 @@ function(egCore , $q) {
]
}
-})
+}])
.directive("egVolEdit", function () {
return {
commit 7f14d09634fb9e631621c06033075533e37c680b
Author: Jason Etheridge <jason at EquinoxInitiative.org>
Date: Wed Sep 12 08:10:32 2018 -0400
lp1731370 CSS styling for new items and volumes
previous commit just handled volumes, this handles copies
Signed-off-by: Jason Etheridge <jason at EquinoxInitiative.org>
Signed-off-by: Elaine Hardy <ehardy at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2
index 05fe3203a5..ce076d5bac 100644
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -331,3 +331,4 @@ table.custom-label-table td {
}
.new-cn { background-color: lightgreen; }
+.new-cp { background-color: lightgreen; }
diff --git a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
index db744d3fb1..9898136d75 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -486,7 +486,7 @@ function(egCore , $q) {
restrict: 'E',
replace: true,
template:
- '<div class="row">'+
+ '<div class="row" ng-class="{'+"'new-cp'"+':is_new}">'+
'<div class="col-xs-5" ng-class="{'+"'has-error'"+':barcode_has_error}">'+
'<input id="{{callNumber.id()}}_{{copy.id()}}"'+
' eg-enter="nextBarcode(copy.id())" class="form-control"'+
@@ -506,11 +506,13 @@ function(egCore , $q) {
$scope.barcode_has_error = false;
$scope.duplicate_barcode = false;
$scope.empty_barcode = false;
+ $scope.is_new = false;
$scope.duplicate_barcode_string = window.duplicate_barcode_string;
$scope.empty_barcode_string = window.empty_barcode_string;
var duplicate_check_count = 0;
if (!$scope.copy.barcode()) $scope.copy.empty_barcode = true;
+ if ($scope.copy.isnew() || $scope.copy.id() < 0) $scope.copy.is_new = $scope.is_new = true;
$scope.selectOnFocus = function($event) {
if (!$scope.copy.empty_barcode)
commit 187100f24a9354b407a598266c15c3f6cf9b3663
Author: Jason Etheridge <jason at EquinoxInitiative.org>
Date: Wed Sep 5 09:13:49 2018 -0400
lp1731370 CSS styling for new items and volumes
in vol/copy editor
Signed-off-by: Jason Etheridge <jason at EquinoxInitiative.org>
Signed-off-by: Elaine Hardy <ehardy at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2
index 8b432272b0..05fe3203a5 100644
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -328,4 +328,6 @@ table.custom-label-table td {
overflow-x: scroll;
overflow-y: scroll;
white-space: nowrap;
-}
\ No newline at end of file
+}
+
+.new-cn { background-color: lightgreen; }
diff --git a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
index 29bd7f0e1c..db744d3fb1 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -596,7 +596,7 @@ function(egCore , $q) {
replace: true,
transclude: true,
template:
- '<div class="row">'+
+ '<div class="row" ng-class="{'+"'new-cn'"+':!callNumber.not_ephemeral}">'+
'<div class="col-xs-2">'+
'<button aria-label="Delete" style="margin:-5px -15px; float:left;" ng-hide="callNumber.not_ephemeral" type="button" class="close" ng-click="removeCN()">×</button>' +
'<select class="form-control" ng-model="classification" ng-change="updateClassification()" ng-options="cl.name() for cl in classification_list"></select>'+
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/staff/cat/volcopy/index.tt2 | 2 ++
Open-ILS/src/templates/staff/css/cat.css.tt2 | 4 +++-
Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js | 16 ++++++++++------
3 files changed, 15 insertions(+), 7 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list