[Bug 10052] New: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 Bug ID: 10052 Summary: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts Classification: Unclassified Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: ASSIGNED Severity: minor Priority: P5 - low Component: Staff Client Assignee: m.de.rooy@rijksmuseum.nl Reporter: m.de.rooy@rijksmuseum.nl CC: gmcharlt@gmail.com This is actually a followup on bug 8263: Make OPAC stylesheet preferences more consistent. The changes for intranet smaller. Pref intranetstylesheet may be blank: meaning use staff-global.css (no change) if it contains a full http or https prefixed string, use that (no change) if it contains a root symbol / at the start, just follow the pref (no change) if it contains something else, it should be interpreted as relative and prefixed with [themelanguage]/css (this is NEW behavior and just like OPAC) Pref intranetcolorstylesheet now is always prefixed with theme/css. For consistency with opac and intranetstylesheet, we should add the above logic for an absolute path (root symbol) or http(s) prefixed path. This means that we add new behavior: allow css for colors outside the themedir and even remote. Does this change need a db revision? If intranetstylesheet now contains say $relpath (not blank and not starting with http or root symbol), and we must assume that it worked :), we cannot simply prefix it with theme. What to do? Most safe approach is: prefix $relpath with / here. So: Yes, we do need a db rev for this unusual case. There is no change needed for the intranetcolorstylesheet. This report changes include doc-head-close.inc, and updates the descriptions for the prefs in staff_client.pref, with a dbrev in updatedatabase.pl. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #1 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 17441 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17441&action=edit Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts Allow a relative path (within theme/css) in intranetstylesheet too. Allow a full path, local or remote with http(s), in intranetcolorstylesheet. This restores consistency between opac and staff. Test plan: First: the patch with the db revision should have been applied. And also the updatestructure step from the web installer should have been run. Clear intranetstylesheet. Check included stylesheet with page source in browser. Enter a full path with http or / in intranetstylesheet. Check again. Enter a relative path (such as staff-global.css). Check again. Clear intranetcolorstylesheet. Check if there is no reference with page source. Enter a full path with http or / in intranetcolorstylesheet. Check reference. Enter a relative path (such as blue.css). Check again. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #17441|0 |1 is obsolete| | --- Comment #2 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 17442 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17442&action=edit Bug 10052: Db revision for intranetstylesheet Report 10052 makes the intranetstylesheet prefs behave like the opac ones. This patch contains an optional db revision: If the pref intranetstylesheet is not blank, and does not start with http, https or /, then prefix it with a slash to make it an absolute path. Test plan: Before applying this patch: 1) Put intranet-tmpl/prog/en/css/staff-global.css into intranetstylesheet. This works in the current staff client, but will be interpreted as relative as soon as both patches for this report have been applied. Apply the patch. And run: /cgi-bin/koha/installer/install.pl?step=3&op=updatestructure Check the webinstaller message and the pref value. There should be a slash in front now. The css should still work. Continue after applying this patch with: 2) Clear the intranetstylesheet pref. Run updatestructure again. No message: OK 3) Put /intranet-tmpl/prog/en/css/staff-global.css in intranetstylesheet. Run updatestructure again. No message: OK 4) Prefix intranetstylesheet with http://[your-server-here]. Test again. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #3 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 17443 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17443&action=edit Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts Allow a relative path (within theme/css) in intranetstylesheet too. Allow a full path, local or remote with http(s), in intranetcolorstylesheet. This restores consistency between opac and staff. Test plan: First: the patch with the db revision should have been applied. And also the updatestructure step from the web installer should have been run. Clear intranetstylesheet. Check included stylesheet with page source in browser. Enter a full path with http or / in intranetstylesheet. Check again. Enter a relative path (such as staff-global.css). Check again. Clear intranetcolorstylesheet. Check if there is no reference with page source. Enter a full path with http or / in intranetcolorstylesheet. Check reference. Enter a relative path (such as blue.css). Check again. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #4 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Wait: I will move the Print Version statement of the dbrev outside the if. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #17442|0 |1 is obsolete| | Attachment #17443|0 |1 is obsolete| | --- Comment #5 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 17444 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17444&action=edit Bug 10052: Db revision for intranetstylesheet Report 10052 makes the intranetstylesheet prefs behave like the opac ones. This patch contains an optional db revision: If the pref intranetstylesheet is not blank, and does not start with http, https or /, then prefix it with a slash to make it an absolute path. Test plan: Before applying this patch: 1) Put intranet-tmpl/prog/en/css/staff-global.css into intranetstylesheet. This works in the current staff client, but will be interpreted as relative as soon as both patches for this report have been applied. Apply the patch. And run: /cgi-bin/koha/installer/install.pl?step=3&op=updatestructure Check the webinstaller warning and the pref value. There should be a slash in front now. The css should still work. Continue after applying this patch with: 2) Clear the intranetstylesheet pref. Run updatestructure again. No message: OK 3) Put /intranet-tmpl/prog/en/css/staff-global.css in intranetstylesheet. Run updatestructure again. No message: OK 4) Prefix intranetstylesheet with http://[your-server-here]. Test again. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #6 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 17445 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17445&action=edit Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts Allow a relative path (within theme/css) in intranetstylesheet too. Allow a full path, local or remote with http(s), in intranetcolorstylesheet. This restores consistency between opac and staff. Test plan: First: the patch with the db revision should have been applied. And also the updatestructure step from the web installer should have been run. Clear intranetstylesheet. Check included stylesheet with page source in browser. Enter a full path with http or / in intranetstylesheet. Check again. Enter a relative path (such as staff-global.css). Check again. Clear intranetcolorstylesheet. Check if there is no reference with page source. Enter a full path with http or / in intranetcolorstylesheet. Check reference. Enter a relative path (such as blue.css). Check again. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #7 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Still some work to do: koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc Will move the code to an include? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #8 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 17446 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17446&action=edit Bug 10052 Followup for edithelp.tt and help-top.inc A grep on the stylesheet names revealed that similar code was used in those template files. This patch moves the code from doc-head-close.inc to a new include file. Now, doc-head-close and the help templates refer to that one file. Test plan: If you tested the preceding two patches, now you only need to: 1) Check included css via page source in browser from staff main page. 2) Check it also from some other location. 3) Check again from Help: e.g. /cgi-bin/koha/help.pl 4) Check again from Edit Help: /cgi-bin/koha/edithelp.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #17446|0 |1 is obsolete| | --- Comment #9 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 17465 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17465&action=edit Bug 10052 Followup for edithelp.tt and help-top.inc A grep on the stylesheet names revealed that similar code was used in those template files. This patch moves the code from doc-head-close.inc to a new include file. Now, doc-head-close and the help templates refer to that one file. Test plan: If you tested the preceding two patches, now you only need to: 1) Check included css via page source in browser from staff main page. 2) Check it also from some other location. 3) Check again from Help: e.g. /cgi-bin/koha/help.pl 4) Check again from Edit Help: /cgi-bin/koha/edithelp.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #17444|0 |1 is obsolete| | --- Comment #10 from Chris Cormack <chris@bigballofwax.co.nz> --- Created attachment 17918 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17918&action=edit Bug 10052: Db revision for intranetstylesheet Report 10052 makes the intranetstylesheet prefs behave like the opac ones. This patch contains an optional db revision: If the pref intranetstylesheet is not blank, and does not start with http, https or /, then prefix it with a slash to make it an absolute path. Test plan: Before applying this patch: 1) Put intranet-tmpl/prog/en/css/staff-global.css into intranetstylesheet. This works in the current staff client, but will be interpreted as relative as soon as both patches for this report have been applied. Apply the patch. And run: /cgi-bin/koha/installer/install.pl?step=3&op=updatestructure Check the webinstaller warning and the pref value. There should be a slash in front now. The css should still work. Continue after applying this patch with: 2) Clear the intranetstylesheet pref. Run updatestructure again. No message: OK 3) Put /intranet-tmpl/prog/en/css/staff-global.css in intranetstylesheet. Run updatestructure again. No message: OK 4) Prefix intranetstylesheet with http://[your-server-here]. Test again. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #17445|0 |1 is obsolete| | --- Comment #11 from Chris Cormack <chris@bigballofwax.co.nz> --- Created attachment 17919 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17919&action=edit Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts Allow a relative path (within theme/css) in intranetstylesheet too. Allow a full path, local or remote with http(s), in intranetcolorstylesheet. This restores consistency between opac and staff. Test plan: First: the patch with the db revision should have been applied. And also the updatestructure step from the web installer should have been run. Clear intranetstylesheet. Check included stylesheet with page source in browser. Enter a full path with http or / in intranetstylesheet. Check again. Enter a relative path (such as staff-global.css). Check again. Clear intranetcolorstylesheet. Check if there is no reference with page source. Enter a full path with http or / in intranetcolorstylesheet. Check reference. Enter a relative path (such as blue.css). Check again. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #17465|0 |1 is obsolete| | --- Comment #12 from Chris Cormack <chris@bigballofwax.co.nz> --- Created attachment 17920 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=17920&action=edit Bug 10052 Followup for edithelp.tt and help-top.inc A grep on the stylesheet names revealed that similar code was used in those template files. This patch moves the code from doc-head-close.inc to a new include file. Now, doc-head-close and the help templates refer to that one file. Test plan: If you tested the preceding two patches, now you only need to: 1) Check included css via page source in browser from staff main page. 2) Check it also from some other location. 3) Check again from Help: e.g. /cgi-bin/koha/help.pl 4) Check again from Edit Help: /cgi-bin/koha/edithelp.pl Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA CC| |katrin.fischer@bsz-bw.de --- Comment #13 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Marcel, I am trying to figure out how this works and entered a http://... into my intranetstylesheet preference. I can see that it works for the staff pages, but the help files (http://localhost:8080/cgi-bin/koha/help.pl) still refer to staff-global.css. Can you take a look please? All 3 patches were applied and the databaes update left my http:// URL alone. <title>Online Help</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="/intranet-tmpl/prog/en/includes/favicon.ico" type="image/x-icon" /> <link rel="stylesheet" type="text/css" href="/intranet-tmpl/lib/jquery/jquery-ui.css" /> <link rel="stylesheet" type="text/css" media="print" href="/intranet-tmpl/prog/en/css/print.css" /> <link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/css/staff-global.css" /> <!-- local colors --> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #17918|0 |1 is obsolete| | Attachment #17919|0 |1 is obsolete| | Attachment #17920|0 |1 is obsolete| | --- Comment #14 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 18109 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18109&action=edit Bug 10052: Db revision for intranetstylesheet Report 10052 makes the intranetstylesheet prefs behave like the opac ones. This patch contains an optional db revision: If the pref intranetstylesheet is not blank, and does not start with http, https or /, then prefix it with a slash to make it an absolute path. Test plan: Before applying this patch: 1) Put intranet-tmpl/prog/en/css/staff-global.css into intranetstylesheet. This works in the current staff client, but will be interpreted as relative as soon as both patches for this report have been applied. Apply the patch. And run: /cgi-bin/koha/installer/install.pl?step=3&op=updatestructure Check the webinstaller warning and the pref value. There should be a slash in front now. The css should still work. Continue after applying this patch with: 2) Clear the intranetstylesheet pref. Run updatestructure again. No message: OK 3) Put /intranet-tmpl/prog/en/css/staff-global.css in intranetstylesheet. Run updatestructure again. No message: OK 4) Prefix intranetstylesheet with http://[your-server-here]. Test again. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #15 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 18110 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18110&action=edit Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts Allow a relative path (within theme/css) in intranetstylesheet too. Allow a full path, local or remote with http(s), in intranetcolorstylesheet. This restores consistency between opac and staff. Test plan: First: the patch with the db revision should have been applied. And also the updatestructure step from the web installer should have been run. Clear intranetstylesheet. Check included stylesheet with page source in browser. Enter a full path with http or / in intranetstylesheet. Check again. Enter a relative path (such as staff-global.css). Check again. Clear intranetcolorstylesheet. Check if there is no reference with page source. Enter a full path with http or / in intranetcolorstylesheet. Check reference. Enter a relative path (such as blue.css). Check again. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #16 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 18111 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18111&action=edit Bug 10052 Followup for edithelp.tt and help-top.inc A grep on the stylesheet names revealed that similar code was used in those template files. This patch moves the code from doc-head-close.inc to a new include file. Now, doc-head-close and the help templates refer to that one file. Test plan: If you tested the preceding two patches, now you only need to: 1) Check included css via page source in browser from staff main page. 2) Check it also from some other location. 3) Check again from Help: e.g. /cgi-bin/koha/help.pl 4) Check again from Edit Help: /cgi-bin/koha/edithelp.pl Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #17 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 18112 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18112&action=edit Bug 10052: QA Followup As Katrin pointed out, the intranetstylesheet setting was not respected in the help pages. The script help.pl does not use get_template_and_user which sets these variables via Auth.pm but calls gettemplate. This makes it necessary to 'manually' set them. This patch does that. Evidently, this could be the case for some other templates vars too.. Test plan: Apply all patches for 10052. Change intranetstylesheet. Check a help page. Change intranetcolorstylesheet. Check a help page. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off --- Comment #18 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to comment #13)
I am trying to figure out how this works and entered a http://... into my intranetstylesheet preference. I can see that it works for the staff pages, but the help files (http://localhost:8080/cgi-bin/koha/help.pl) still refer to staff-global.css. Can you take a look please? All 3 patches were applied and the databaes update left my http:// URL alone.
Good testing, Katrin! Gründlich :) Thanks. You found something that must have been there for some time already.. The template var was not filled because it is not loaded via get_template_and_user but just gettemplate. Added a QA followup to fill them now. Resolved merge conflict on updatedb. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA Patch complexity|--- |Small patch -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18109|0 |1 is obsolete| | Attachment #18110|0 |1 is obsolete| | Attachment #18111|0 |1 is obsolete| | Attachment #18112|0 |1 is obsolete| | --- Comment #19 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 18124 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18124&action=edit [PASSED QA] Bug 10052: Db revision for intranetstylesheet Report 10052 makes the intranetstylesheet prefs behave like the opac ones. This patch contains an optional db revision: If the pref intranetstylesheet is not blank, and does not start with http, https or /, then prefix it with a slash to make it an absolute path. Test plan: Before applying this patch: 1) Put intranet-tmpl/prog/en/css/staff-global.css into intranetstylesheet. This works in the current staff client, but will be interpreted as relative as soon as both patches for this report have been applied. Apply the patch. And run: /cgi-bin/koha/installer/install.pl?step=3&op=updatestructure Check the webinstaller warning and the pref value. There should be a slash in front now. The css should still work. Continue after applying this patch with: 2) Clear the intranetstylesheet pref. Run updatestructure again. No message: OK 3) Put /intranet-tmpl/prog/en/css/staff-global.css in intranetstylesheet. Run updatestructure again. No message: OK 4) Prefix intranetstylesheet with http://[your-server-here]. Test again. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Comments on last patch. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #20 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 18125 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18125&action=edit [PASSED QA] Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts Allow a relative path (within theme/css) in intranetstylesheet too. Allow a full path, local or remote with http(s), in intranetcolorstylesheet. This restores consistency between opac and staff. Test plan: First: the patch with the db revision should have been applied. And also the updatestructure step from the web installer should have been run. Clear intranetstylesheet. Check included stylesheet with page source in browser. Enter a full path with http or / in intranetstylesheet. Check again. Enter a relative path (such as staff-global.css). Check again. Clear intranetcolorstylesheet. Check if there is no reference with page source. Enter a full path with http or / in intranetcolorstylesheet. Check reference. Enter a relative path (such as blue.css). Check again. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #21 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 18126 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18126&action=edit [PASSED QA] Bug 10052 Followup for edithelp.tt and help-top.inc A grep on the stylesheet names revealed that similar code was used in those template files. This patch moves the code from doc-head-close.inc to a new include file. Now, doc-head-close and the help templates refer to that one file. Test plan: If you tested the preceding two patches, now you only need to: 1) Check included css via page source in browser from staff main page. 2) Check it also from some other location. 3) Check again from Help: e.g. /cgi-bin/koha/help.pl 4) Check again from Edit Help: /cgi-bin/koha/edithelp.pl Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Template only, no string changes. Tested according to test plan. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #22 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 18127 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18127&action=edit [PASSED QA] Bug 10052: QA Followup As Katrin pointed out, the intranetstylesheet setting was not respected in the help pages. The script help.pl does not use get_template_and_user which sets these variables via Auth.pm but calls gettemplate. This makes it necessary to 'manually' set them. This patch does that. Evidently, this could be the case for some other templates vars too.. Test plan: Apply all patches for 10052. Change intranetstylesheet. Check a help page. Change intranetcolorstylesheet. Check a help page. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Looks all good to me now. Passes tests and still no string changes. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|master |3.14 --- Comment #23 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- String changes on the patch "Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts." Holding for 3.14. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 --- Comment #24 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Oh sorry, missed that :( -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|3.14 |master --- Comment #25 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Version back to master. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10052 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #26 from Galen Charlton <gmcharlt@gmail.com> --- Pushed to master. Thanks, Marcel! -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org