|
Description
Owen Leonard
2019-06-07 12:27:27 UTC
Created attachment 90460 [details] [review] Bug 23078: Use Koha.Preference in OPAC global header include This patch updates the OPAC's doc-head-close.inc so that it uses 'Koha.Preference' syntax to output system preference data. The patch removes handling of two preferences from Auth.pm which which are covered by this template change. This patch also makes some minor changes to consolidate multiple template checks for "bidi" To test, apply the patch and test the affected OPAC system preferences: - OpacFavicon - opaclayoutstylesheet - OPACUserCSS - OPACBaseURL Confirm that changes made to these preferences are reflected in the OPAC. Comment on attachment 90460 [details] [review] Bug 23078: Use Koha.Preference in OPAC global header include Review of attachment 90460 [details] [review]: ----------------------------------------------------------------- Fix the lines that should be removed, and I'll sign off. :) ::: koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc @@ +9,4 @@ > [% IF ( bidi ) %] > [% Asset.css("lib/bootstrap/css/bootstrap-rtl.min.css") | $raw %] > + [% Asset.css("lib/jquery/jquery-ui-rtl.css") | $raw %] > + [% Asset.css("css/right-to-left.css") | $raw %] Nice clean up moves. @@ +20,1 @@ > [% END %] You probably could have deleted these three lines. Because extra lines got left behind. (In reply to M. Tompsett from comment #3) > Because extra lines got left behind. 18 [% IF ( bidi ) %] 19 [% ELSE %] 20 [% END %] Those ones. Created attachment 90481 [details] [review] Bug 23078: Use Koha.Preference in OPAC global header include This patch updates the OPAC's doc-head-close.inc so that it uses 'Koha.Preference' syntax to output system preference data. The patch removes handling of two preferences from Auth.pm which which are covered by this template change. This patch also makes some minor changes to consolidate multiple template checks for "bidi" To test, apply the patch and test the affected OPAC system preferences: - OpacFavicon - opaclayoutstylesheet - OPACUserCSS - OPACBaseURL Confirm that changes made to these preferences are reflected in the OPAC. Created attachment 90936 [details] [review] Bug 23078: Use Koha.Preference in OPAC global header include This patch updates the OPAC's doc-head-close.inc so that it uses 'Koha.Preference' syntax to output system preference data. The patch removes handling of two preferences from Auth.pm which which are covered by this template change. This patch also makes some minor changes to consolidate multiple template checks for "bidi" To test, apply the patch and test the affected OPAC system preferences: - OpacFavicon - opaclayoutstylesheet - OPACUserCSS - OPACBaseURL Confirm that changes made to these preferences are reflected in the OPAC. Signed-off-by: frederik <frederik@inlibro.com> Frederik seems to have forgotten to set the status to signed off. My former comments were addressed. Fixing status. Created attachment 91349 [details] [review] Bug 23078: Use Koha.Preference in OPAC global header include This patch updates the OPAC's doc-head-close.inc so that it uses 'Koha.Preference' syntax to output system preference data. The patch removes handling of two preferences from Auth.pm which which are covered by this template change. This patch also makes some minor changes to consolidate multiple template checks for "bidi" To test, apply the patch and test the affected OPAC system preferences: - OpacFavicon - opaclayoutstylesheet - OPACUserCSS - OPACBaseURL Confirm that changes made to these preferences are reflected in the OPAC. Signed-off-by: frederik <frederik@inlibro.com> Signed-off-by: Nadine Pierre <nadine.pierre@inLibro.com> Hi Owen,
can you explain why those 2 lines in Auth.pm are still needed with patches applied?
OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"),
opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
Also found these:
koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt:<link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon | url %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt:<link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon | url %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt:[% IF ( Koha.Preference('OpacFavicon') ) %]
koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt:[% IF ( OPACUserCSS ) %]<style>[% OPACUserCSS | $raw %]</style>[% END %]
koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt:[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
Can you please check?
Created attachment 91430 [details] [review] Bug 23078: (follow-up) Update self checkout help page This patch takes care of some preference instances I missed in the self checkout module's help page. It also removes some obsolete lines from Auth.pm. To test, apply the patch and re-test based on the previous test plan. Also test in the self-checkout module by logging into self checkout and clicking the "Help" link in the upper right of the screen. The settings of the following preferences should be shown correctly: - OpacFavicon - OPACUserCSS Created attachment 91431 [details] [review] Bug 23078: (follow-up) Update self checkout help page This patch takes care of some preference instances I missed in the self checkout module's help page. It also removes some obsolete lines from Auth.pm. To test, apply the patch and re-test based on the previous test plan. Also test in the self-checkout module by logging into self checkout and clicking the "Help" link in the upper right of the screen. The settings of the following preferences should be shown correctly: - OpacFavicon - OPACUserCSS Created attachment 91503 [details] [review] Bug 23078: (follow-up) Update self checkout help page This patch takes care of some preference instances I missed in the self checkout module's help page. It also removes some obsolete lines from Auth.pm. To test, apply the patch and re-test based on the previous test plan. Also test in the self-checkout module by logging into self checkout and clicking the "Help" link in the upper right of the screen. The settings of the following preferences should be shown correctly: - OpacFavicon - OPACUserCSS Signed-off-by: frederik chenier <frederik.chenier@inlibro.com> Created attachment 91626 [details] [review] Bug 20607: Make Koha::SearchEngine::Elasticsearch::reset_elasticsearch_mappings take weight into account Test plan: - apply this patch, - edit admin/searchengine/elasticsearch/mappings.yaml to add weight for some fields, - go to admin > search engine configuration, - reset your mappings (add ?op=reset&i_know_what_i_am_doing=1 to url), - check that weights you've added are set Signed-off-by: Nicolas Legrand <nicolas.legrand@bulac.fr> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Created attachment 91627 [details] [review] Bug 20607: (QA follow-up) Test corrections Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> I think Nick accidentally marked this one PQA when meaning to mark another bug, setting back to SO Created attachment 91654 [details] [review] Bug 23078: Use Koha.Preference in OPAC global header include This patch updates the OPAC's doc-head-close.inc so that it uses 'Koha.Preference' syntax to output system preference data. The patch removes handling of two preferences from Auth.pm which which are covered by this template change. This patch also makes some minor changes to consolidate multiple template checks for "bidi" To test, apply the patch and test the affected OPAC system preferences: - OpacFavicon - opaclayoutstylesheet - OPACUserCSS - OPACBaseURL Confirm that changes made to these preferences are reflected in the OPAC. Signed-off-by: frederik <frederik@inlibro.com> Signed-off-by: Nadine Pierre <nadine.pierre@inLibro.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Created attachment 91655 [details] [review] Bug 23078: (follow-up) Update self checkout help page This patch takes care of some preference instances I missed in the self checkout module's help page. It also removes some obsolete lines from Auth.pm. To test, apply the patch and re-test based on the previous test plan. Also test in the self-checkout module by logging into self checkout and clicking the "Help" link in the upper right of the screen. The settings of the following preferences should be shown correctly: - OpacFavicon - OPACUserCSS Signed-off-by: frederik chenier <frederik.chenier@inlibro.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Nice work! Pushed to master for 19.11.00 Pushed to 19.05.x for 19.05.03 It is nice to see code becoming more clean and clear. Thanks a lot for this job ;) backported to 18.11.x for 18.11.09 |