[Bug 20173] New: Clean up koha-tmpl directory
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 Bug ID: 20173 Summary: Clean up koha-tmpl directory Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: minor Priority: P5 - low Component: Templates Assignee: oleonard@myacpl.org Reporter: dcook@prosentient.com.au QA Contact: testopia@bugs.koha-community.org At the moment, there are the following files in git: koha-tmpl/favicon.ico koha-tmpl/index.html koha-tmpl/intranet.html koha-tmpl/opac.html As far as I can tell, these files aren't actually used for anything. Looking at the git log, it looks like these are a holdover from 2003 when koha-tmpl replaced koha-html? Looks quite safe to remove these files now. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff Patch complexity|--- |Trivial patch -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #1 from David Cook <dcook@prosentient.com.au> --- Created attachment 71408 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=71408&action=edit Bug 20173 - Clean up koha-tmpl directory This patch removes some HTML and ico files that are no longer used in Koha. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #2 from David Cook <dcook@prosentient.com.au> --- Note: These files don't even make it through the build process of Koha, as far as I can tell. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA Assignee|oleonard@myacpl.org |dcook@prosentient.com.au CC| |mtompset@hotmail.com --- Comment #3 from M. Tompsett <mtompset@hotmail.com> --- I confirmed the favicon.ico, but then your patch to remove things didn't include it. I also noticed that the apache configuration files had ProxyPass, ProxyPassReverse, and ScriptAlias values related to index.html as well, so perhaps we should clean those up too? And yes, intranet and opac html files are only in the index.html file. I'll mark this "Failed QA" for definitely the first point, but I would like clarification on why not the second paragraph. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de --- Comment #4 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Why do you think the favicon is not used? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #5 from M. Tompsett <mtompset@hotmail.com> --- (In reply to Katrin Fischer from comment #4)
Why do you think the favicon is not used?
Because the templates only use the ones in the image subdirectories, not the koha-tmpl directory directly. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #6 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Owen confirmed on IRC that the favicon.ico can go. Do we have an idea if the rest of the files is needed or why they were added in the first place? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |In Discussion -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #7 from David Cook <dcook@prosentient.com.au> --- (In reply to M. Tompsett from comment #3)
I confirmed the favicon.ico, but then your patch to remove things didn't include it.
Yes it does. Look at "Splinter Review" then "Overview". It will mention that the binary file is deleted.
I also noticed that the apache configuration files had ProxyPass, ProxyPassReverse, and ScriptAlias values related to index.html as well, so perhaps we should clean those up too?
You're referring to the Apache/Plack configuration files? That's not referring to this index.html. That's referring to the default index.html that web browsers look for.
And yes, intranet and opac html files are only in the index.html file.
I'll mark this "Failed QA" for definitely the first point, but I would like clarification on why not the second paragraph.
You're wrong about the first point, although you could apply the patch to find that out for sure. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #8 from M. Tompsett <mtompset@hotmail.com> --- (In reply to David Cook from comment #7)
(In reply to M. Tompsett from comment #3)
I confirmed the favicon.ico, but then your patch to remove things didn't include it.
Yes it does. Look at "Splinter Review" then "Overview". It will mention that the binary file is deleted.
I stand corrected. Okay. But could someone clarify the proper course of action with index.html?
... this index.html ... [is] ... referring to the default index.html that web browsers look for.
Right, so should we modify it or remove it? Leaving in discussion. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #9 from David Cook <dcook@prosentient.com.au> --- (In reply to M. Tompsett from comment #8)
I stand corrected. Okay. But could someone clarify the proper course of action with index.html?
... this index.html ... [is] ... referring to the default index.html that web browsers look for.
Right, so should we modify it or remove it? Leaving in discussion.
We should remove it. In Apache, that index.html is just an alias to a Perl script. Plus, the index.html that I'm removing isn't even in the DocumentRoot. Without some other directive to reference it, it's not going to be used by the web server. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|In Discussion |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #71408|0 |1 is obsolete| | --- Comment #10 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 71695 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=71695&action=edit Bug 20173 - Clean up koha-tmpl directory This patch removes some HTML and ico files that are no longer used in Koha. NOTE: index.html decision pushed up to QA people. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |julian.maurice@biblibre.com Status|Signed Off |Failed QA --- Comment #11 from Julian Maurice <julian.maurice@biblibre.com> --- There is still a reference to this favicon.ico in koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc: <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #12 from David Cook <dcook@prosentient.com.au> --- (In reply to Julian Maurice from comment #11)
There is still a reference to this favicon.ico in koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc:
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
I don't really think that's worth failing something over, since that line will have generated an error since forever ago (since ./koha-tmpl/favicon.ico isn't in the DocumentRoot) but OK. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #13 from David Cook <dcook@prosentient.com.au> --- (In reply to Julian Maurice from comment #11)
There is still a reference to this favicon.ico in koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc:
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
So I'm actually finding something pretty weird here. I've applied the patch and this is what I see in my browser's network tab: favicon.ico 302 x-perl Other 257 B 1.39 s 648889 Looking at my Apache virtual host config... I see with a git install that "../git/koha-tmpl" is the document root, so I suppose ./koha-tmpl/favicon.ico would show in a git install. (Although in a Debian install the document roots should be "/usr/share/koha/intranet/htdocs" and "/usr/share/koha/opac/htdocs".) In any case... the ./koha-tmpl/favicon.ico is gone and I see nothing in the Apache config that should be causing a redirect. I see the favicon in my browser and it seems to be downloading it and not retrieving it from a browser cache... -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #14 from David Cook <dcook@prosentient.com.au> --- Created a fake favicon.ico and the browser is still showing the real Koha one... but I see the following in the network tab: favicon.ico 200 x-icon Other 269 B 3 ms 652379 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #15 from David Cook <dcook@prosentient.com.au> --- If I try to visit the favicon, I see the following: favicon.ico 200 document Other 269 B 9 ms 655653 favicon.ico 200 x-icon Other (from disk cache) 1 ms 0 I reckon Chrome must be caching the favicon and using it on a host basis. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #16 from David Cook <dcook@prosentient.com.au> --- Whoa, this is cool/scary: I created ./koha-tmpl/favicon2.ico and I'm visiting the URL: "<git install>/favicon2.ico" on Tab 2 of my browser. On Tab 1, I'm visiting "/cgi-bin/koha/installer/install.pl?step=1&op=updatestructure". I see the following in my network tab on tab 2: favicon2.ico 200 document Other 269 B 15 ms 656742 favicon.ico 302 x-perl Other 257 B 1.36 s 656742 install.pl?step=1&op=updatestructure 200 text/html favicon.ico 3.7 KB 1.38 s 656742 I reckon that Chrome is looking at other tabs to see if it has a favicon for that same host. That's creepy. I'll have to shutdown Chrome to test that theory... -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #17 from David Cook <dcook@prosentient.com.au> --- OK I don't quite know how it's doing it, but it is caching super heavily. I just used the following "convert -size 200x200 xc:none -fill red -draw "circle 20,20 10,10 circle 100,100 50,50" favicon.ico" and that switched the favicon for the tab...and after deleting it from the server, it's still being used in the browser after multiple fresh loads... -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #18 from David Cook <dcook@prosentient.com.au> --- Guess it doesn't really matter how it's doing it. I'll just update the file to be consistent with the other intranet pages. Interesting how browsers try to outsmart the servers though... -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #19 from David Cook <dcook@prosentient.com.au> --- Created attachment 71917 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=71917&action=edit Fix favicon.ico path in installer This patch corrects the favicon.ico path for the installer. On git installs, it used to point to ./koha-tmpl/favicon.ico, and on regular installs, it probably just didn't work. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #20 from Fridolin SOMERS <fridolin.somers@biblibre.com> --- Created attachment 72249 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72249&action=edit Bug 20173: Clean up koha-tmpl directory This patch removes some HTML and ico files that are no longer used in Koha. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #21 from Fridolin SOMERS <fridolin.somers@biblibre.com> --- Created attachment 72250 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72250&action=edit Bug 20173: Fix favicon.ico path in installer This patch corrects the favicon.ico path for the installer. On git installs, it used to point to ./koha-tmpl/favicon.ico, and on regular installs, it probably just didn't work. https://bugs.koha-community.org/show_bug.cgi?id=20173 Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m Status|Needs Signoff |Signed Off --- Comment #22 from Fridolin SOMERS <fridolin.somers@biblibre.com> --- I signoff for a dev install : DocumentRoot is on /home/koha/src/koha-tmpl The home page still works. I have corrected commit message according to https://wiki.koha-community.org/wiki/Commit_messages -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #71695|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #71917|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 --- Comment #23 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Favicons still display, can find no references to the files. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #72249|0 |1 is obsolete| | --- Comment #24 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 72285 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72285&action=edit Bug 20173: Clean up koha-tmpl directory This patch removes some HTML and ico files that are no longer used in Koha. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #72250|0 |1 is obsolete| | --- Comment #25 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 72286 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72286&action=edit Bug 20173: Fix favicon.ico path in installer This patch corrects the favicon.ico path for the installer. On git installs, it used to point to ./koha-tmpl/favicon.ico, and on regular installs, it probably just didn't work. https://bugs.koha-community.org/show_bug.cgi?id=20173 Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20173 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #26 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Pushed to master for 18.05, thanks to everybody involved! -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org