Summary: | Re-indent circulation.tt | ||
---|---|---|---|
Product: | Koha | Reporter: | Owen Leonard <oleonard> |
Component: | Templates | Assignee: | Owen Leonard <oleonard> |
Status: | CLOSED FIXED | QA Contact: | Testopia <testopia> |
Severity: | enhancement | ||
Priority: | P5 - low | CC: | martin.renvoize, maryse.simard, nick, testopia |
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
Change sponsored?: | --- | Patch complexity: | Small patch |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: |
19.05.00
|
|
Bug Depends on: | |||
Bug Blocks: | 30068 | ||
Attachments: |
Bug 20520: Re-indent moremember.tt
Bug 21034: Re-indent circulation.tt Bug 21034: Re-indent circulation.tt Bug 21034: Re-indent circulation.tt Bug 21034: Re-indent circulation.tt Bug 21034: Re-indent circulation.tt Bug 21034: Re-indent circulation.tt Bug 21034: Re-indent circulation.tt Bug 21034: Re-indent circulation.tt |
Description
Owen Leonard
2018-07-03 18:14:55 UTC
Created attachment 76656 [details] [review] Bug 20520: Re-indent moremember.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Created attachment 77710 [details] [review] Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Created attachment 77732 [details] [review] Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Created attachment 77739 [details] [review] Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Always nice to bring some sanity to the indenting :) No regressions found, passing QA. Needs a rebase on 13618, sorry Owen Created attachment 78267 [details] [review] Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 84387 [details] [review] Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Patch doesn't apply Applying: Bug 21034: Re-indent circulation.tt Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 21034: Re-indent circulation.tt Created attachment 88548 [details] [review] Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Created attachment 88569 [details] [review] Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Created attachment 88593 [details] [review] Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Awesome work all! Pushed to master for 19.05 Enhancement will not be backported to 18.11.x series. |