@@ -, +, @@
with collapsed settings panel
- View the checkin page. The "checkin settings" panel should be
collapsed by default.
- Confirm that the settings panel collapses and expands as it should.
- Confirm that selecting "Forgive overdue charges" or "Book drop mode"
trigger the display of the correct message and that the style of the
barcode field is changed.
- Confirm that after submitting a barcode for check-in, the
settings panel stays open and your selected settings are still
selected.
- Confirm that specifying a due date and selecting "remember" shows
a new message with the selected date.
- Confirm that unchecking "remember" hides the message.
- Confirm that date settings are remembered and the correct message
displayed (or not) during check-in.
- Test with CircSidebar enabled and disabled.
---
.../intranet-tmpl/prog/css/src/staff-global.scss | 29 +++-
.../prog/en/modules/circ/circulation.tt | 16 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 180 +++++++++++++--------
.../intranet-tmpl/prog/js/pages/circulation.js | 28 ++--
4 files changed, 156 insertions(+), 97 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -490,11 +490,6 @@ input {
}
}
- &.alert {
- background-color: #FFFF99;
- border-color: #900;
- }
-
&.hasDatepicker {
background-image: url("../img/famfamfam/silk/calendar.png");
background-position-x: right;
@@ -523,6 +518,11 @@ input {
}
}
+.input-warning {
+ background-color: #FF9;
+ border-color: #900;
+}
+
label,
.label {
color: #000;
@@ -1981,7 +1981,7 @@ i {
}
}
-.checkout-setting {
+.circ-setting {
font-size: 85%;
padding-top: .3em;
@@ -1995,7 +1995,7 @@ i {
}
}
-.checkout-settings {
+.circ-settings {
background-color: #F4F8F9;
border-radius: 0;
border-top: 2px solid #B9D8D9;
@@ -2006,10 +2006,23 @@ i {
padding: 1em 1em 0;
}
-#show-checkout-settings {
+#show-circ-settings {
margin-top: .5em;
}
+.checkin-active-setting {
+ background-color: #FFC;
+ border-radius: 3px;
+ box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5);
+ margin: .5em;
+ padding: .5em;
+}
+
+.form-control-group {
+ white-space: nowrap;
+}
+
+
.blocker {
color: #990000;
}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -546,15 +546,15 @@
-
-
Checkout settings
+
-
+
[% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %]
[% IF ( SpecifyDueDate ) %]
-
+
Specify due date [% INCLUDE 'date-format.inc' %]:
[% IF ( duedatespec ) %]
@@ -573,7 +573,7 @@
[% END %]
[% UNLESS ( noissues ) %]
-
+
[% IF NEEDSCONFIRMATION %]
[% ELSE %]
@@ -583,7 +583,7 @@
[% IF Koha.Preference('decreaseLoanHighHolds') %]
-
+
[% IF NEEDSCONFIRMATION %]
[% IF override_high_holds %]
@@ -603,7 +603,7 @@
[% END %]
[% IF Koha.Preference('OnSiteCheckouts') %]
-
+
[% IF noissues %]
@@ -616,7 +616,7 @@
[% END %]
-
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -669,91 +669,116 @@
[% END%]
-
-
Fines for returned items are forgiven.
-
-
-
Fines are not charged for manually cancelled holds.
-
-
-
Book drop mode. (Effective checkin date is [% dropboxdate | $KohaDates %] ).
-
-
-
+ [% ELSE %]
+
+
+ [% END %]
@@ -828,6 +856,7 @@
[% INCLUDE 'columns_settings.inc' %]
[% INCLUDE 'calendar.inc' %]
[% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
+ [% Asset.js("js/pages/circulation.js") | $raw %]
[% INCLUDE 'timepicker.inc' %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
@@ -54,26 +54,26 @@ $(document).ready(function() {
return false;
});
- var checkout_settings = $(".checkout-settings");
- var checkout_settings_icon = $(".checkout-settings-icon");
+ var circ_settings = $(".circ-settings");
+ var circ_settings_icon = $(".circ-settings-icon");
- // If any checkboxes in the checkout settings are selected, show the settings by default
- if ( $(".checkout-settings input:checked,#duedatespec[value!='']").length ) {
- checkout_settings.show();
- checkout_settings_icon.removeClass("fa-caret-right").addClass("fa-caret-down");
+ // If any checkboxes in the circ settings are selected, show the settings by default
+ if ( $(".circ-settings input:checked,#duedatespec[value!='']").length ) {
+ circ_settings.show();
+ circ_settings_icon.removeClass("fa-caret-right").addClass("fa-caret-down");
} else {
- checkout_settings.hide();
- checkout_settings_icon.removeClass("fa-caret-down").addClass("fa-caret-right");
+ circ_settings.hide();
+ circ_settings_icon.removeClass("fa-caret-down").addClass("fa-caret-right");
}
- $("#show-checkout-settings a").on("click",function(){
- if( checkout_settings.is(":hidden")){
- checkout_settings.show();
- checkout_settings_icon.removeClass("fa-caret-right").addClass("fa-caret-down");
+ $("#show-circ-settings a").on("click",function(){
+ if( circ_settings.is(":hidden")){
+ circ_settings.show();
+ circ_settings_icon.removeClass("fa-caret-right").addClass("fa-caret-down");
} else {
$("#barcode").focus();
- checkout_settings.hide();
- checkout_settings_icon.removeClass("fa-caret-down").addClass("fa-caret-right");
+ circ_settings.hide();
+ circ_settings_icon.removeClass("fa-caret-down").addClass("fa-caret-right");
}
});
--