[Bug 8623] New: Javascript libraries should be outside theme directories
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Priority: P5 - low Change sponsored?: --- Bug ID: 8623 Assignee: oleonard@myacpl.org Summary: Javascript libraries should be outside theme directories Severity: normal Classification: Unclassified OS: All Reporter: jcamins@cpbibliography.com Hardware: All Status: NEW Version: master Component: Templates Product: Koha Similar to bug 4048, which seeks to move Koha's non-translatable assets outside of language-specific directories, third-party javascript libraries should be stored outside of the theme hierarchy entirely, in koha-tmpl/opac-tmpl/lib/ and koha-tmpl/intranet-tmpl/lib/. This will prevent future regressions in Koha's theming functionality. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 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=8623 --- Comment #1 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- Created attachment 11564 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11564&action=edit Bug 8623: Do not accept "lib" as a valid theme Since we are going to be storing third-party Javascript libraries in koha-tmpl/opac-tmpl/lib and koha-tmpl/intranet-tmpl/lib, we want to make sure that "lib" is not picked up as a theme in the system preferences editor. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 --- Comment #2 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- Created attachment 11570 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11570&action=edit Bug 8623: Move YUI out of prog This patch moves the YUI assets from koha-tmpl/opac-tmpl/prog/en/lib/yui to koha-tmpl/opac-tmpl/lib/yui. NOTE: This was tested on Chrome, FF, and Safari on a Mac, and IE and FF on Windows. To test: 1) View a smattering of pages on the OPAC and intranet. If the move did not work flawlessly, layout will be way off. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #3 from Owen Leonard <oleonard@myacpl.org> --- The second patch doesn't apply: Applying: Bug 8623: Move YUI out of prog fatal: sha1 information is lacking or useless (C4/Templates.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff CC| |chris@bigballofwax.co.nz Blocks| |8622 --- Comment #4 from Chris Cormack <chris@bigballofwax.co.nz> --- Owen, it depends on the patch for bug 8622 being applied first. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nahuel.angelinetti@biblibre | |.com --- Comment #5 from Owen Leonard <oleonard@myacpl.org> --- *** Bug 4048 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #11564|0 |1 is obsolete| | --- Comment #6 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 11581 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11581&action=edit Bug 8623: Do not accept "lib" as a valid theme Since we are going to be storing third-party Javascript libraries in koha-tmpl/opac-tmpl/lib and koha-tmpl/intranet-tmpl/lib, we want to make sure that "lib" is not picked up as a theme in the system preferences editor. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #11570|0 |1 is obsolete| | --- Comment #7 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 11582 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11582&action=edit Bug 8623: Move YUI out of prog This patch moves the YUI assets from koha-tmpl/opac-tmpl/prog/en/lib/yui to koha-tmpl/opac-tmpl/lib/yui. NOTE: This was tested on Chrome, FF, and Safari on a Mac, and IE and FF on Windows. To test: 1) View a smattering of pages on the OPAC and intranet. If the move did not work flawlessly, layout will be way off. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off CC| |kyle@bywatersolutions.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |mtj@kohaaloha.com --- Comment #8 from Mason James <mtj@kohaaloha.com> --- (In reply to comment #7)
Created attachment 11582 [details] Bug 8623: Move YUI out of prog
This patch moves the YUI assets from koha-tmpl/opac-tmpl/prog/en/lib/yui to koha-tmpl/opac-tmpl/lib/yui.
NOTE: This was tested on Chrome, FF, and Safari on a Mac, and IE and FF on Windows.
To test: 1) View a smattering of pages on the OPAC and intranet. If the move did not work flawlessly, layout will be way off.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
QA comments patch wont apply against master '322a9c7fbbcf456084d1937f48345b3cdec058ce' please resend a patch that applies against master ------------------------------------------- mason@xen1:~/git/head-clean$ gl |head -1 commit 322a9c7fbbcf456084d1937f48345b3cdec058ce mason@xen1:~/git/head-clean$ git bz apply 8623 Bug 8623 - Javascript libraries should be outside theme directories Bug 8623: Do not accept "lib" as a valid theme Apply? [yn] y Applying: Bug 8623: Do not accept "lib" as a valid theme Bug 8623: Move YUI out of prog Apply? [yn] y Applying: Bug 8623: Move YUI out of prog fatal: sha1 information is lacking or useless (C4/Templates.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8623: Move YUI out of prog When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Patch left in /tmp/Bug-8623-Move-YUI-out-of-prog-DVU7vK.patch ------------------------------------------- -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 --- Comment #9 from Mason James <mtj@kohaaloha.com> ---
please resend a patch that applies against master
... or explain a suitable method to apply the patch successfully (which i might be missing) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #10 from Mason James <mtj@kohaaloha.com> ---
QA comments patch wont apply against master '322a9c7fbbcf456084d1937f48345b3cdec058ce'
please resend a patch that applies against master
all good :) this patch applies OK, after patch 8622 ready for QA again... -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |8597 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA QA Contact| |mtj@kohaaloha.com --- Comment #11 from Mason James <mtj@kohaaloha.com> ---
all good :) this patch applies OK, after patch 8622
ready for QA again...
passing QA on this $ koha-qa.pl -c 2 testing 2 commit(s) (applied to commit 6ca9b8f) * ba98cb9 Bug 8623: Move YUI out of prog C4/Templates.pm koha-tmpl/opac-tmpl/lib/yui/button.css koha-tmpl/opac-tmpl/lib/yui/container.css koha-tmpl/opac-tmpl/lib/yui/container/container-min.js koha-tmpl/opac-tmpl/lib/yui/container/container_core-min.js koha-tmpl/opac-tmpl/lib/yui/menu.css koha-tmpl/opac-tmpl/lib/yui/menu/menu-min.js koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css koha-tmpl/opac-tmpl/lib/yui/skin.css koha-tmpl/opac-tmpl/lib/yui/utilities/utilities.js koha-tmpl/opac-tmpl/lib/yui/yui-sprite.png koha-tmpl/opac-tmpl/prog/en/css/opac.css koha-tmpl/opac-tmpl/prog/en/css/sco.css koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc koha-tmpl/opac-tmpl/prog/en/lib/yui/button.css koha-tmpl/opac-tmpl/prog/en/lib/yui/container.css koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container-min.js koha-tmpl/opac-tmpl/prog/en/lib/yui/container/container_core-min.js koha-tmpl/opac-tmpl/prog/en/lib/yui/menu.css koha-tmpl/opac-tmpl/prog/en/lib/yui/menu/menu-min.js koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css koha-tmpl/opac-tmpl/prog/en/lib/yui/skin.css koha-tmpl/opac-tmpl/prog/en/lib/yui/utilities/utilities.js koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt * 2de8f5f Bug 8623: Do not accept "lib" as a valid theme C4/Koha.pm * C4/Templates.pm OK * C4/Koha.pm OK * koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc OK * koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt OK * koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt OK -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master CC| |paul.poulain@biblibre.com Version|master |rel_3_10 Assignee|oleonard@myacpl.org |jcamins@cpbibliography.com Severity|normal |enhancement --- Comment #12 from Paul Poulain <paul.poulain@biblibre.com> --- I could not find any difference between display before and after the patch, which is what I was expecting. However, I think it's more an ENH than a bugfix, changing status. But, as usual, chris_c, it's your final decision. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #11581|0 |1 is obsolete| | Attachment #11582|0 |1 is obsolete| | --- Comment #13 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Created attachment 12289 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12289&action=edit Bug 8623 - Fix YUI path for OPAC in debian/rules After the changes to YUI path the build process is broken. For testing this I had to set the build process to ommit the tests as there are some db_dependent test being called (which failed). To do this I ran the build script like this: sudo DEB_BUILD_OPTIONS=nocheck ./debian/build-git-snapshot -distribution precise -D precise -r ~/ubuntu -v 3.9.0-046~git -d Note: Even when this is fixed, there are still issues with some files missing dh_install: etc/koha/searchengine/solr/config.yaml exists in debian/tmp but is not installed to anywhere dh_install: etc/koha/searchengine/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere dh_install: etc/koha/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere dh_install: missing files, aborting make: *** [binary] Error 2 dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 Sponsored-by: Universidad Nacional de Córdoba -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |ASSIGNED CC| |tomascohen@gmail.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Tomás Cohen Arazi <tomascohen@gmail.com> 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=8623 Jared Camins-Esakov <jcamins@cpbibliography.com> 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=8623 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12289|0 |1 is obsolete| | --- Comment #14 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- Created attachment 12554 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12554&action=edit Bug 8623 - Fix YUI path for OPAC in debian/rules After the changes to YUI path the build process is broken. For testing this I had to set the build process to ommit the tests as there are some db_dependent test being called (which failed). To do this I ran the build script like this: sudo DEB_BUILD_OPTIONS=nocheck ./debian/build-git-snapshot -distribution precise -D precise -r ~/ubuntu -v 3.9.0-046~git -d Note: Even when this is fixed, there are still issues with some files missing dh_install: etc/koha/searchengine/solr/config.yaml exists in debian/tmp but is not installed to anywhere dh_install: etc/koha/searchengine/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere dh_install: etc/koha/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere dh_install: missing files, aborting make: *** [binary] Error 2 dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Please note that debian/rules *must* use tabs. If you have a git hook that automatically replaces tabs with spaces, please undo those changes. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 --- Comment #15 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- Created attachment 12555 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12555&action=edit Bug 8623 follow-up: make sure CCSR theme loads YUI -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|enhancement |normal --- Comment #16 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- Follow-ups fix bugs. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 --- Comment #17 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 12574 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12574&action=edit [SIGNED-OFF] Bug 8623 - Fix YUI path for OPAC in debian/rules After the changes to YUI path the build process is broken. For testing this I had to set the build process to ommit the tests as there are some db_dependent test being called (which failed). To do this I ran the build script like this: sudo DEB_BUILD_OPTIONS=nocheck ./debian/build-git-snapshot -distribution precise -D precise -r ~/ubuntu -v 3.9.0-046~git -d Note: Even when this is fixed, there are still issues with some files missing dh_install: etc/koha/searchengine/solr/config.yaml exists in debian/tmp but is not installed to anywhere dh_install: etc/koha/searchengine/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere dh_install: etc/koha/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere dh_install: missing files, aborting make: *** [binary] Error 2 dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Please note that debian/rules *must* use tabs. If you have a git hook that automatically replaces tabs with spaces, please undo those changes. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12554|0 |1 is obsolete| | Attachment #12555|0 |1 is obsolete| | --- Comment #18 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 12575 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12575&action=edit [SIGNED-OFF] Bug 8623 follow-up: make sure CCSR theme loads YUI Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Kyle M Hall <kyle@bywatersolutions.com> 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=8623 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA --- Comment #19 from Mason James <mtj@kohaaloha.com> --- (In reply to comment #18)
Created attachment 12575 [details] [SIGNED-OFF] Bug 8623 follow-up: make sure CCSR theme loads YUI
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
passing QA on 2 patches, tested OK $ koha-qa.pl -c 2 testing 2 commit(s) (applied to commit 0a35b26) * fabf5cf Bug 8623 follow-up: make sure CCSR theme loads YUI koha-tmpl/opac-tmpl/ccsr/en/css/opac.css koha-tmpl/opac-tmpl/ccsr/en/css/sco.css koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc * 399f7cd Bug 8623 - Fix YUI path for OPAC in debian/rules debian/rules * koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc OK -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #20 from Paul Poulain <paul.poulain@biblibre.com> --- Patch pushed to master (1st patch pushed to bug_8623 branch, 2nd patch on master only, does not apply on bug_8623) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8623 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |RESOLVED 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