Created attachment 76137 [details]
Screenshot showing active book drop mode setting
Created attachment 76139 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and clear your browser cache if necessary. - 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. Created attachment 76526 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and clear your browser cache if necessary. - 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. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> I have the "Checkin" button at the bottom of the barcode input. https://screenshots.firefox.com/FK6HtuCBLyx28NEA/pro.kohadev.org Tomas tested on Ubuntu 18.04 + 1080p, with chrome, chromium and FF: https://snag.gy/LGTqCl.jpg Created attachment 76560 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and clear your browser cache if necessary. - 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. Created attachment 76561 [details] [review] Bug 20959: (follow-up) Prevent checkin button from wrapping This follow-up wraps the checkin form in a div to prevent the button from wrapping to the line below the input. To test, apply the patch and clear your browser cache if necessary. View the checkin page to confirm that there isn't a layout problem. (In reply to Jonathan Druart from comment #8) > Still not: https://screenshots.firefox.com/fqd4mfODVhwLxDXI/pro.kohadev.org Well yes, it fixed the position of the button. But now the messages on the right (settings) overlap the button. Created attachment 78733 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and clear your browser cache if necessary. - 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. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Created attachment 78734 [details] [review] Bug 20959: (follow-up) Prevent checkin button from wrapping This follow-up wraps the checkin form in a div to prevent the button from wrapping to the line below the input. To test, apply the patch and clear your browser cache if necessary. View the checkin page to confirm that there isn't a layout problem. Created attachment 78810 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and clear your browser cache if necessary. - 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. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Created attachment 78812 [details] [review] Bug 20959: (follow-up) Prevent checkin button from wrapping This follow-up wraps the checkin form in a div to prevent the button from wrapping to the line below the input. To test, apply the patch and clear your browser cache if necessary. View the checkin page to confirm that there isn't a layout problem. Created attachment 78831 [details] [review] Bug 20959: (Follow-up) Keep informational notes open after checkin This patch modifies the template so that the on-screen messages about settings like 'Book drop mode' stay open from one checkout to another. To test, apply the patch and test checking combinations of 'Forgive overdue charges' and 'Book drop mode,' verifying that their corresponding onscreen messages appear correctly and stay visible (or not) from one checkout to another. Display wise it works as described. The layout looks fine on my end. The only issue I have is that this changes past behavior, in that you have an extra step to open the options. Typical upgrades try to maintain past behavior, and are changed by preference setting. While I HATE having another preference setting, I know too many people are going to complain that they have to open that up every morning. This may be griped about more than the similar switch on the checkout page. Perhaps, instead of a system preference, you do the same kind of setting similar to the checkbox on the checkouts TABLE that keeps the table open everytime you pull up the page. The other thought is, why have a message displayed to the side, if when you have the feature active, it always shows? Seems redundant. Cool, but redundant. The ONLY reason I would have the messages pinned to the side is if the feature settings were not glued to the page. Make sense? Created attachment 78839 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and clear your browser cache if necessary. - 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. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org> Created attachment 78840 [details] [review] Bug 20959: (follow-up) Prevent checkin button from wrapping This follow-up wraps the checkin form in a div to prevent the button from wrapping to the line below the input. To test, apply the patch and clear your browser cache if necessary. View the checkin page to confirm that there isn't a layout problem. Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org> Created attachment 78841 [details] [review] Bug 20959: (Follow-up) Keep informational notes open after checkin This patch modifies the template so that the on-screen messages about settings like 'Book drop mode' stay open from one checkout to another. To test, apply the patch and test checking combinations of 'Forgive overdue charges' and 'Book drop mode,' verifying that their corresponding onscreen messages appear correctly and stay visible (or not) from one checkout to another. Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org> I signed off, as it works as described. My concerns still apply. Also, I don't know if it is consistent behavior prior to the patch, but why doesn't using the manual date option present a message up on the right like the checkboxes do? In the last patch the following part reads wrong: + [% IF ( forgivemanualholdsexpire ) %] + <div id="forgivemanualholdsexpire-alert" class="checkin-active-setting" style="display:none;"> + [% ELSE %] + <div id="forgivemanualholdsexpire-alert" class="checkin-active-setting" style="display:none;"> + [% END %] Created attachment 79757 [details] [review] Bug 20959: (Follow-up) Keep informational notes open after checkin This patch modifies the template so that the on-screen messages about settings like 'Book drop mode' stay open from one checkout to another. To test, apply the patch and test checking combinations of 'Forgive overdue charges' and 'Book drop mode,' verifying that their corresponding onscreen messages appear correctly and stay visible (or not) from one checkout to another. Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org> Patch doesn't apply - Owen, can you please rebase? CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt Created attachment 82995 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and clear your browser cache if necessary. - 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. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org> Created attachment 82996 [details] [review] Bug 20959: (follow-up) Prevent checkin button from wrapping This follow-up wraps the checkin form in a div to prevent the button from wrapping to the line below the input. To test, apply the patch and clear your browser cache if necessary. View the checkin page to confirm that there isn't a layout problem. Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org> Created attachment 82997 [details] [review] Bug 20959: (follow-up) Keep informational notes open after checkin This patch modifies the template so that the on-screen messages about settings like 'Book drop mode' stay open from one checkout to another. To test, apply the patch and test checking combinations of 'Forgive overdue charges' and 'Book drop mode,' verifying that their corresponding onscreen messages appear correctly and stay visible (or not) from one checkout to another. Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org> Created attachment 83180 [details] [review] Bug 20959: Prevent the scrollbar to move to the top on click We could use e.preventDefault but it seems better to make the link wider than just the size of the text. However we lost the on a:hover style, we may want to reintroduce it (In reply to Jonathan Druart from comment #27) > Created attachment 83180 [details] [review] [review] > Bug 20959: Prevent the scrollbar to move to the top on click Hi Owen, can you give me your opinion on this patch? I can provide a follow-up to fix the :hover style if you think it is ok. Created attachment 83772 [details] [review] Bug 20959: (follow-up) Alternate: Add preventDefault to link controls This patch adds a missing preventDefault to the function for showing and hiding the checkin settings panel. This prevents the page from unexpected scrolling when the link is clicked. To test, apply the patch and go to Circulation -> Check in. Reduce the height of the browser window until you have to scroll down to reveal the "Checkin settings" link. Clicking it should not cause the page to scroll. Sorry Jonathan I missed that you had added a follow-up to this. I've submitted an alternative which uses preventDefault. I don't think it makes sense to use the other solution just to make the link target wider. While a wider click target might be easier in some cases, I think it's usually better to make the click target match the controls so that clicking in "empty space" doesn't give unexpected results. (In reply to Owen Leonard from comment #30) > Sorry Jonathan I missed that you had added a follow-up to this. I've > submitted an alternative which uses preventDefault. I don't think it makes > sense to use the other solution just to make the link target wider. While a > wider click target might be easier in some cases, I think it's usually > better to make the click target match the controls so that clicking in > "empty space" doesn't give unexpected results. I always miss that link :) But I am ok with your solution if you disagree. Rebase? :) Created attachment 86477 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and clear your browser cache if necessary. - 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. - Test with CircSidebar enabled and disabled. The rebase for this was tedious enough that I think it could use another look in the form of a signoff. Please? Created attachment 86729 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and clear your browser cache if necessary. - 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. - Test with CircSidebar enabled and disabled. *** Bug 14516 has been marked as a duplicate of this bug. *** Hi Owen, this looks nice! Just something small: the effective checkin date for book drop mode shows in a strange format: 2019-04-02T22:40:10. Can you take a look? Created attachment 87422 [details] [review] Bug 20959: (QA follow-up) Add missing $KohaDates filter This patch adds a missing $KohaDates filter to the display of the book drop mode "effective checkin" date. To test, apply the patch and go to Circulation -> Check in. Check the "Book drop mode" box. The message which displays should show a correctly-formatted effective checkin date. Created attachment 87933 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and clear your browser cache if necessary. - 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. - Test with CircSidebar enabled and disabled. Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com> Created attachment 87934 [details] [review] Bug 20959: (QA follow-up) Add missing $KohaDates filter This patch adds a missing $KohaDates filter to the display of the book drop mode "effective checkin" date. To test, apply the patch and go to Circulation -> Check in. Check the "Book drop mode" box. The message which displays should show a correctly-formatted effective checkin date. Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com> Hi Owen, Everything works fine, I've just got a question before signing this patch. The only case the panel collapse is when I select a specific return date without checking the box "Remember for next check in". That doesn't surprise me, but do you consider this is a correct behaviour ? Created attachment 91081 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and rebuild the staff client CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). Clear your browser cache if necessary. - 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. Created attachment 91123 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and rebuild the staff client CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). Clear your browser cache if necessary. - 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. Signed-off-by: Arthur Bousquet <arthur.bousquet@inlibro.com> This works well for me, just a spelling question: Remember due date for next check in Should it be check-in in this case? (substantive)? Created attachment 91164 [details] [review] Bug 20959: Style checkin form more like the checkout form, with collapsed settings panel This patch modifies the structure of the checkin form so that settings (Specify return date, book drop mode, forgive overdue charges) are in a collapsed panel when inactive. The style of the barcode field and the mode notification messages has been changed to reduce the vertical motion of the form when selecting options. Some class names have been changed in circulation.tt and circulation.js to make them appropriate for use on both forms. To test, apply the patch and rebuild the staff client CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). Clear your browser cache if necessary. - 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. Signed-off-by: Arthur Bousquet <arthur.bousquet@inlibro.com> Nice work! Pushed to master for 19.11.00 Enhancement not pushed to 19.05.x I prefer not change this display in stable branche |
Created attachment 76136 [details] Screenshot of the revised checkin form I think it would be nice to make the checkin page look more like the checkout page, with a collapsed panel where settings like book drop mode can be hidden when not in use.