From 8c5dd8f7bc6eb23754e49c7ce1c9b855d8938ff1 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Fri, 14 Dec 2012 15:45:40 +1300 Subject: [PATCH] Bug 9052 - rewrite the YUI links to use the system library This uses libjs-yui to provide the skin.css and reset-fonts-grids.css files from YUI. It patches the CSS files to point to the right location for the files. To test: * Build a package with this patch included * Install it * Look at the OPAC and note that things no longer look terrible, and that there are no 404's coming from bad CSS URLs. Signed-off-by: Mirko Tietgen I created a package of 3.10+9052, installed and tested. I confirm that the OPAC does not look broken anymore and I could not find 404 errors with Firebug. Signed-off-by: Katrin Fischer I also created a package of 3.10+9052 and removed libchi-* from the debian/control file. The OPAC shows no problems using those packages, layout, pictures and colors seem to all be in place. Also the OPAC on master with patch applied still works as expected. --- debian/rules | 6 ++++-- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 3 +++ .../opac-tmpl/prog/en/includes/doc-head-close.inc | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index cb2eee3..0b75d09 100755 --- a/debian/rules +++ b/debian/rules @@ -92,10 +92,12 @@ override_dh_auto_install: $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png \ $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css + sed -i -e 's:url(.*/reset-fonts-grids.css.*):url("/opac-tmpl/lib/yui/reset-fonts-grids/reset-fonts-grids.css"):' \ + -e 's:url(.*/skin.css.*):url("/opac-tmpl/lib/yui/assets/skins/sam/skin.css"):' \ + $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/opac.css \ + $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/sco.css sed -i -e 's:url(.*/reset-fonts-grids.css.*):url(reset-fonts-grids.css):' \ -e 's:url(.*/skin.css.*):url(skin.css):' \ - $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/opac.css \ - $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/sco.css \ $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css/staff-global*.css mkdir -p $(TMP)/debian/tmp_docbook xsltproc --output $(TMP)/debian/tmp_docbook/ \ diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 06e6bcf..e57aaf3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -1,3 +1,6 @@ +@import url("/opac-tmpl/lib/yui/reset-fonts-grids.css"); +@import url("/opac-tmpl/lib/yui/skin.css"); + a { font-weight : bold; } diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index 4f0e540..1bc9eb3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc @@ -3,8 +3,6 @@ - - [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %] [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %] -- 1.7.9.5