From 7d37655afb3c22884eb3139940e2e7261c23da4d Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 19 Apr 2013 15:14:17 -0300 Subject: [PATCH] Bug 10084 - YUI path wrong in CCSR theme with packages Bug 9052 fixed this for prog, CCSR was left aline in the dark (it's friday). Regards To+ Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Chris Cormack Worked fine in my test package, good work Tomas Signed-off-by: Mason James Signed-off-by: Galen Charlton (cherry picked from commit be1770ffccdff54f3140f3af7f7f1d026c46e05a) Signed-off-by: Jared Camins-Esakov --- debian/rules | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index 971d46cd33..aee34bad31 100755 --- a/debian/rules +++ b/debian/rules @@ -23,12 +23,6 @@ override_dh_auto_install: rm $(TMP)/etc/koha/searchengine/solr/config.yaml rm $(TMP)/etc/koha/searchengine/solr/indexes.yaml rm $(TMP)/etc/koha/solr/indexes.yaml -# rm $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/jquery/jquery.js -# ln -s /usr/share/javascript/jquery/jquery.js \ -# $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/jquery/jquery.js -# rm $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/lib/jquery/jquery.js -# ln -s /usr/share/javascript/jquery/jquery.js \ -# $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/lib/jquery/jquery.js rm -r \ $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/lib/tiny_mce ln -s /usr/share/tinymce2/www \ @@ -59,6 +53,9 @@ override_dh_auto_install: install -m 0644 koha-tmpl/opac-tmpl/lib/yui/skin.css \ koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css \ $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css + install -m 0644 koha-tmpl/opac-tmpl/lib/yui/skin.css \ + koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css \ + $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/ccsr/en/css install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \ $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \ @@ -93,8 +90,11 @@ override_dh_auto_install: $(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 + $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/*/en/css/opac.css \ + $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/*/en/css/sco.css + sed -i -e 's:href="/opac-tmpl/lib/yui/reset-fonts-grids.css":href="/opac-tmpl/lib/yui/reset-fonts-grids/reset-fonts-grids.css":' \ + -e 's:href="/opac-tmpl/lib/yui/skin.css":href="/opac-tmpl/lib/yui/assets/skins/sam/skin.css":' \ + $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/ccsr/en/includes/doc-head-close.inc 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/intranet/htdocs/intranet-tmpl/prog/en/css/staff-global*.css -- 2.39.5