Bug 18506 introduced a regression in the opac-auth template, undoing the changes made by Bug 23797
Whoops, I've falsely accused Bug 18506. Git blames me! Bug 20168!
Created attachment 120008 [details] [review] Bug 28193: OpacLoginInstructions news block broken by Bug 20168 This patch fixes a regression which was introduced by Bug 20168, causing the OpacLoginInstructions template code to revert back to the old system preference behavior. This patch returns the correct markup. To test, apply the patch and view the OPAC login page (/cgi-bin/koha/opac-user.pl) - With no news entry for OpacLoginInstructions you should see the default: A block of text with two headings, "Don't have a password yet?" and "Don't have a library card?" - Go to Tools -> News and create an entry for OpacLoginInstructions. - Return to the OPAC and confirm that your custom text appears. - Try updating/installing another translation and adding a different news entry for that language. Confirm that the correct entry appears.
Created attachment 120026 [details] [review] Bug 28193: OpacLoginInstructions news block broken by Bug 20168 This patch fixes a regression which was introduced by Bug 20168, causing the OpacLoginInstructions template code to revert back to the old system preference behavior. This patch returns the correct markup. To test, apply the patch and view the OPAC login page (/cgi-bin/koha/opac-user.pl) - With no news entry for OpacLoginInstructions you should see the default: A block of text with two headings, "Don't have a password yet?" and "Don't have a library card?" - Go to Tools -> News and create an entry for OpacLoginInstructions. - Return to the OPAC and confirm that your custom text appears. - Try updating/installing another translation and adding a different news entry for that language. Confirm that the correct entry appears. Signed-off-by: David Nind <david@davidnind.com>
Owen, a git grep still reveals some references to the system preference: koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc: [% IF Koha.Preference( 'OpacLoginInstructions' ) %] Can you please check?
Created attachment 120037 [details] [review] Bug 28193: (follow-up) Correct OpacLoginInstructions in login modal
Created attachment 120095 [details] [review] Bug 28193: OpacLoginInstructions news block broken by Bug 20168 This patch fixes a regression which was introduced by Bug 20168, causing the OpacLoginInstructions template code to revert back to the old system preference behavior. This patch returns the correct markup. To test, apply the patch and view the OPAC login page (/cgi-bin/koha/opac-user.pl) - With no news entry for OpacLoginInstructions you should see the default: A block of text with two headings, "Don't have a password yet?" and "Don't have a library card?" - Go to Tools -> News and create an entry for OpacLoginInstructions. - Return to the OPAC and confirm that your custom text appears. - Try updating/installing another translation and adding a different news entry for that language. Confirm that the correct entry appears. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: John Doe <you@example.com>
Created attachment 120096 [details] [review] Bug 28193: (follow-up) Correct OpacLoginInstructions in login modal Signed-off-by: John Doe <you@example.com>
Created attachment 120097 [details] [review] Bug 28193: OpacLoginInstructions news block broken by Bug 20168 This patch fixes a regression which was introduced by Bug 20168, causing the OpacLoginInstructions template code to revert back to the old system preference behavior. This patch returns the correct markup. To test, apply the patch and view the OPAC login page (/cgi-bin/koha/opac-user.pl) - With no news entry for OpacLoginInstructions you should see the default: A block of text with two headings, "Don't have a password yet?" and "Don't have a library card?" - Go to Tools -> News and create an entry for OpacLoginInstructions. - Return to the OPAC and confirm that your custom text appears. - Try updating/installing another translation and adding a different news entry for that language. Confirm that the correct entry appears. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 120098 [details] [review] Bug 28193: (follow-up) Correct OpacLoginInstructions in login modal Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Pushed to master for 21.05, thanks to everybody involved!
Pushed to 20.11.x for 20.11.06
Missing dependency, not pushed to 20.05