[Bug 8624] New: famfamfam should be outside theme directory
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Priority: P5 - low Change sponsored?: --- Bug ID: 8624 Assignee: oleonard@myacpl.org Summary: famfamfam should be outside theme directory Severity: minor Classification: Unclassified OS: All Reporter: jcamins@cpbibliography.com Hardware: All Status: NEW Version: master Component: Templates Product: Koha The famfamfam image set is a standard third-party collection that is not "skinned" for different themes. Therefore, it should be moved outside the theme directory to /koha-tmpl/opac-tmpl/famfamfam/ -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 --- Comment #1 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- Excuse me. famfamfam should be in koha-tmpl/opac-tmpl/lib/famfamfam/ -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 --- Comment #2 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- Created attachment 11569 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11569&action=edit Bug 8624: Move famfamfam out of theme directory The patch moves the famfamfam image set out of the koha-tmpl/opac-tmpl/prog/famfamfam into koha-tmpl/opac-tmpl/famfamfam -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 --- Comment #3 from Owen Leonard <oleonard@myacpl.org> --- This seems like a good opportunity to move famfamfam into the images directory, unless someone knows a reason why it isn't there already? Same goes for itemtypeimg too I guess. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 --- Comment #4 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- Well, there is an argument that the other images might be theme specific, I suppose. However I see no reason why we couldn't pull all images out of the themes, and require theme writers to use theme-specific images when they want to. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|oleonard@myacpl.org |jcamins@cpbibliography.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #11569|0 |1 is obsolete| | --- Comment #5 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 11726 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11726&action=edit [SIGNED-OFF] Bug 8624: Move famfamfam out of theme directory The patch moves the famfamfam image set out of the koha-tmpl/opac-tmpl/prog/famfamfam into koha-tmpl/opac-tmpl/famfamfam Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Owen Leonard <oleonard@myacpl.org> 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=8624 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |8662 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@biblibre.co | |m --- Comment #6 from Jonathan Druart <jonathan.druart@biblibre.com> --- QA Comments: Seems good but there are 2 occurrences not replaced in INSTALL.opensuse: INSTALL.opensuse:cp koha-tmpl/opac-tmpl/prog/famfamfam/silk/error_go.png blib/OPAC_TMPL_DIR/prog/famfamfam/silk/error_go.png INSTALL.opensuse:cp koha-tmpl/opac-tmpl/prog/famfamfam/mini/note.gif blib/OPAC_TMPL_DIR/prog/famfamfam/mini/note.gif And a question: It is not possible to move the koha-tmpl/intranet-tmpl/prog/img/famfamfam/ directory into the same one? And then move them to koha-tmpl/images/famfamfam directly? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 --- Comment #7 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- (In reply to comment #6)
QA Comments:
Seems good but there are 2 occurrences not replaced in INSTALL.opensuse: INSTALL.opensuse:cp koha-tmpl/opac-tmpl/prog/famfamfam/silk/error_go.png blib/OPAC_TMPL_DIR/prog/famfamfam/silk/error_go.png INSTALL.opensuse:cp koha-tmpl/opac-tmpl/prog/famfamfam/mini/note.gif blib/OPAC_TMPL_DIR/prog/famfamfam/mini/note.gif
I will do a follow-up.
And a question: It is not possible to move the koha-tmpl/intranet-tmpl/prog/img/famfamfam/ directory into the same one? And then move them to koha-tmpl/images/famfamfam directly?
Now that you suggest it, I think it might be possible. If Owen can't think of any reason not to, I will submit a revised patch to do this. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 --- Comment #8 from Owen Leonard <oleonard@myacpl.org> --- (In reply to comment #7)
Now that you suggest it, I think it might be possible. If Owen can't think of any reason not to, I will submit a revised patch to do this.
I see no reason not to from the template management point of view. If it is feasible, let's do it. And the same with itemtypeimg? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 --- Comment #9 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- (In reply to comment #8)
(In reply to comment #7)
Now that you suggest it, I think it might be possible. If Owen can't think of any reason not to, I will submit a revised patch to do this.
I see no reason not to from the template management point of view. If it is feasible, let's do it. And the same with itemtypeimg?
Actually, this would not work with standard installs. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mtj@kohaaloha.com --- Comment #10 from Mason James <mtj@kohaaloha.com> --- (In reply to comment #9)
(In reply to comment #8)
(In reply to comment #7)
Now that you suggest it, I think it might be possible. If Owen can't think of any reason not to, I will submit a revised patch to do this.
I see no reason not to from the template management point of view. If it is feasible, let's do it. And the same with itemtypeimg?
Actually, this would not work with standard installs.
hmm, unless we had +symlinks enabled in apache, yeah? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 --- Comment #11 from Jared Camins-Esakov <jcamins@cpbibliography.com> ---
Now that you suggest it, I think it might be possible. If Owen can't think of any reason not to, I will submit a revised patch to do this.
I see no reason not to from the template management point of view. If it is feasible, let's do it. And the same with itemtypeimg?
Actually, this would not work with standard installs.
hmm, unless we had +symlinks enabled in apache, yeah?
Ooh, that's an intriguing idea. I'm not sure how to do that in a way that won't break dev installs, though, since most developers don't update their koha-httpd.conf files. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA QA Contact| |mtj@kohaaloha.com --- Comment #12 from Mason James <mtj@kohaaloha.com> ---
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
patch looks GREAT!!!, passing QA… ;) $ koha-qa.pl testing 1 commit(s) (applied to commit 0acebb8) * 052bd3d Bug 8624: Move famfamfam out of theme directory koha-tmpl/opac-tmpl/lib/famfamfam/AR.png ... koha-tmpl/opac-tmpl/lib/famfamfam/BK.png koha-tmpl/opac-tmpl/prog/famfamfam/silk/zoom_in.png koha-tmpl/opac-tmpl/prog/famfamfam/silk/zoom_out.png * koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt OK * koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl OK * koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl OK * koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl OK * koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl OK -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |paul.poulain@biblibre.com --- Comment #13 from Paul Poulain <paul.poulain@biblibre.com> --- (In reply to comment #11)
Now that you suggest it, I think it might be possible. If Owen can't think of any reason not to, I will submit a revised patch to do this.
I see no reason not to from the template management point of view. If it is feasible, let's do it. And the same with itemtypeimg?
Actually, this would not work with standard installs.
hmm, unless we had +symlinks enabled in apache, yeah?
Ooh, that's an intriguing idea. I'm not sure how to do that in a way that won't break dev installs, though, since most developers don't update their koha-httpd.conf files.
mmm... I'm not sure I should push this patch. Is there still a debate ? why famfam and not itemtypeimg ? Has anyone checked it will it work with standard installs as well as dev ones ? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 wajasu <matted-34813@mypacks.net> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |matted-34813@mypacks.net --- Comment #14 from wajasu <matted-34813@mypacks.net> --- ok, i did a standard install from the signed off patch. i inspected /usr/share/koha/.../lib/famfamfam and such and it looked fine. i turned on the XSLT Details( with "default" and see the BK.png in my details in opac and staff client. I'm assuming the SIGNED-OFF patch had other places confirmed. wajasu -- You are receiving this mail because: You are watching all bug changes.
/opac-tmpl/prog/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt"></xsl:attr ibute></xsl:element> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='Mon'"><img s rc="/opac-tmpl/prog/famfamfam/silk/book.png" alt="Bok" title="Bok"/> Bok</xsl:when> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='Per'"><img s rc="/opac-tmpl/prog/famfamfam/silk/newspaper.png" alt="Periodika"
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Failed QA --- Comment #15 from Paul Poulain <paul.poulain@biblibre.com> --- I find some references to prog/famfam using: grep -R "prog/famfamfam" *|more not a big deal = INSTALL.opensuse:cp koha-tmpl/opac-tmpl/prog/famfamfam/silk/error_go.png blib/OPAC_TMPL_DIR/prog/famfamfam/silk/error_go.png INSTALL.opensuse:cp koha-tmpl/opac-tmpl/prog/famfamfam/mini/note.gif blib/OPAC_TMPL_DIR/prog/famfamfam/mini/note.gif much more important: koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl: <xsl:element name="img"><xsl:attribute name="src" title="Periodika"/> Periodika</xsl:when> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='Fil'"><img s rc="/opac-tmpl/prog/famfamfam/silk/computer_link.png" alt="Fil" title="Fil"/> Fil</xsl:when> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='Kar'"><img s rc="/opac-tmpl/prog/famfamfam/silk/map.png" alt="Kart" title="Kart"/> Kart</xsl:when> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='FV'"><img sr c="/opac-tmpl/prog/famfamfam/silk/film.png" alt="Film og video" title="Film og video"/> Film og video</xsl:when> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='Mus'"><img s rc="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="Musikktrykk og lydopptak" title="Musikktrykk og lydopptak"/> Musikk</xsl:w hen> Please also fix them to gain "patch pushed" ;-) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Passed QA --- Comment #16 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- (In reply to comment #15)
I find some references to prog/famfam using: grep -R "prog/famfamfam" *|more
not a big deal = INSTALL.opensuse:cp koha-tmpl/opac-tmpl/prog/famfamfam/silk/error_go.png blib/OPAC_TMPL_DIR/prog/famfamfam/silk/error_go.png INSTALL.opensuse:cp koha-tmpl/opac-tmpl/prog/famfamfam/mini/note.gif blib/OPAC_TMPL_DIR/prog/famfamfam/mini/note.gif
/opac-tmpl/prog/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt"></xsl:attr ibute></xsl:element> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='Mon'"><img s rc="/opac-tmpl/prog/famfamfam/silk/book.png" alt="Bok" title="Bok"/> Bok</xsl:when> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='Per'"><img s rc="/opac-tmpl/prog/famfamfam/silk/newspaper.png" alt="Periodika"
much more important: koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl: <xsl:element name="img"><xsl:attribute name="src" title="Periodika"/> Periodika</xsl:when> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='Fil'"><img s rc="/opac-tmpl/prog/famfamfam/silk/computer_link.png" alt="Fil" title="Fil"/> Fil</xsl:when> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='Kar'"><img s rc="/opac-tmpl/prog/famfamfam/silk/map.png" alt="Kart" title="Kart"/> Kart</xsl:when> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='FV'"><img sr c="/opac-tmpl/prog/famfamfam/silk/film.png" alt="Film og video" title="Film og video"/> Film og video</xsl:when> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='Mus'"><img s rc="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="Musikktrykk og lydopptak" title="Musikktrykk og lydopptak"/> Musikk</xsl:w hen>
Please also fix them to gain "patch pushed" ;-)
This patch is OPAC-only. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Failed QA CC| |magnus@enger.priv.no --- Comment #17 from Paul Poulain <paul.poulain@biblibre.com> --- (In reply to comment #16)
This patch is OPAC-only.
Right, but, even if we speak of intranet files, they contain opac-tmpl links:
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl: <xsl:when test="$typeOf008='Mon'"><img s rc="/opac-tmpl/prog/famfamfam/silk/book.png" alt="Bok" title="Bok"/> Bok</xsl:when>
=> /opac-tmpl/prog/famfamfam/silk/book.png link that is now wrong Adding Magnus to this bug ! (and back to failed QA) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 --- Comment #18 from Magnus Enger <magnus@enger.priv.no> --- Wow, I messed up nicely! But I think the fix for this should be a separate bug, so I have created Bug 8793 - "Remove references to OPAC icons from NORMARC staff XSLT" and will have a fix for it shortly. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Passed QA --- Comment #19 from Paul Poulain <paul.poulain@biblibre.com> --- OK, this one is passing QA then, i'll push it now -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master Version|master |rel_3_10 --- Comment #20 from Paul Poulain <paul.poulain@biblibre.com> --- Patch pushed to master (suggesting keeping it for 3.10 in case we've missed something) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Magnus Enger <magnus@enger.priv.no> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |8793 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8624 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |RESOLVED CC| |chris@bigballofwax.co.nz Resolution|--- |FIXED --- Comment #21 from Chris Cormack <chris@bigballofwax.co.nz> --- Released in 3.10.0 -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org