Description
Jared Camins-Esakov
2012-08-12 23:57:46 UTC
Created attachment 11564 [details] [review] 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. Created attachment 11570 [details] [review] 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. 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. Owen, it depends on the patch for bug 8622 being applied first. *** Bug 4048 has been marked as a duplicate of this bug. *** Created attachment 11581 [details] [review] 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> Created attachment 11582 [details] [review] 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> (In reply to comment #7) > Created attachment 11582 [details] [review] > 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 -------------------------------------------
> please resend a patch that applies against master
>
... or explain a suitable method to apply the patch successfully
(which i might be missing)
>
> 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...
> 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 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. Created attachment 12289 [details] [review] 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 Created attachment 12554 [details] [review] 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. Created attachment 12555 [details] [review] Bug 8623 follow-up: make sure CCSR theme loads YUI Follow-ups fix bugs. Created attachment 12574 [details] [review] [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> Created attachment 12575 [details] [review] [SIGNED-OFF] Bug 8623 follow-up: make sure CCSR theme loads YUI Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> (In reply to comment #18) > Created attachment 12575 [details] [review] > [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 Patch pushed to master (1st patch pushed to bug_8623 branch, 2nd patch on master only, does not apply on bug_8623) Released in 3.10.0 |