[open-ils-commits] r390 - in conifer/trunk: tools web/opac/skin/lul/xml/common web/opac/skin/nosm/xml/common web/opac/skin/uwin/xml/common (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-04-26 11:02:42 -0400 (Sun, 26 Apr 2009)
New Revision: 390

Modified:
   conifer/trunk/tools/patch_conifer.sh
   conifer/trunk/web/opac/skin/lul/xml/common/css_common.xml
   conifer/trunk/web/opac/skin/nosm/xml/common/css_common.xml
   conifer/trunk/web/opac/skin/uwin/xml/common/css_common.xml
Log:
Better OpenSearch scoping.
Munge the JS pointers twice (argh)


Modified: conifer/trunk/tools/patch_conifer.sh
===================================================================
--- conifer/trunk/tools/patch_conifer.sh	2009-04-26 14:49:24 UTC (rev 389)
+++ conifer/trunk/tools/patch_conifer.sh	2009-04-26 15:02:42 UTC (rev 390)
@@ -84,6 +84,7 @@
 		for munge_file in 'page_rdetail.xml' 'page_mresult.xml' 'page_rresult.xml'
 		do
 			sed -i -e "s/skin\/default\/js/skin\/$skin\_test\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/"$munge_file"
+			sed -i -e "s/skin\/default_test\/js/skin\/$skin\_test\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/"$munge_file"
 		done
 		sed -i -e "s/\/$skin\/css\/layout.css/\/$skin\_test\/css\/layout.css/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/common/css_common.xml
 

Modified: conifer/trunk/web/opac/skin/lul/xml/common/css_common.xml
===================================================================
--- conifer/trunk/web/opac/skin/lul/xml/common/css_common.xml	2009-04-26 14:49:24 UTC (rev 389)
+++ conifer/trunk/web/opac/skin/lul/xml/common/css_common.xml	2009-04-26 15:02:42 UTC (rev 390)
@@ -14,7 +14,7 @@
 <!-- OpenSearch auto discovery -->
 <link type="application/opensearchdescription+xml"
 	rel='search' title="Laurentian Library Catalogue"
-	href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/-/osd.xml" />
+	href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/OSUL/osd.xml" />
 
 <!-- enable Dojo date picker -->
 <style type="text/css">

Modified: conifer/trunk/web/opac/skin/nosm/xml/common/css_common.xml
===================================================================
--- conifer/trunk/web/opac/skin/nosm/xml/common/css_common.xml	2009-04-26 14:49:24 UTC (rev 389)
+++ conifer/trunk/web/opac/skin/nosm/xml/common/css_common.xml	2009-04-26 15:02:42 UTC (rev 390)
@@ -14,7 +14,7 @@
 <!-- OpenSearch auto discovery -->
 <link type="application/opensearchdescription+xml"
 	rel='search' title="NOSM Library Catalogue"
-	href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/-/osd.xml" />
+	href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/OSM/osd.xml" />
 
 <!-- enable Dojo date picker -->
 <style type="text/css">

Modified: conifer/trunk/web/opac/skin/uwin/xml/common/css_common.xml
===================================================================
--- conifer/trunk/web/opac/skin/uwin/xml/common/css_common.xml	2009-04-26 14:49:24 UTC (rev 389)
+++ conifer/trunk/web/opac/skin/uwin/xml/common/css_common.xml	2009-04-26 15:02:42 UTC (rev 390)
@@ -14,7 +14,7 @@
 <!-- OpenSearch auto discovery -->
 <link type="application/opensearchdescription+xml"
 	rel='search' title="UWindsor Library Catalogue"
-	href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/-/osd.xml" />
+	href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/OWA/osd.xml" />
 
 <!-- enable Dojo date picker -->
 <style type="text/css">