Escape ampersands in URLs; unescaped ampersands completely break all skins

Add entity definitions to fr-CA locale to avoid breaking fr-CA versions of skins

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/trunk@464 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/web/opac/locale/en-CA/opac_conifer.dtd b/web/opac/locale/en-CA/opac_conifer.dtd
index 440bda2..2d997e7 100644 (file)
--- a/web/opac/locale/en-CA/opac_conifer.dtd
+++ b/web/opac/locale/en-CA/opac_conifer.dtd
@@ -11,14 +11,14 @@
 <!ENTITY lu.footer.library.about "Home">
 <!ENTITY lu.footer.library.url "http://laurentian.ca/library">
 <!ENTITY lu.footer.help.url "http://laurentian.ca/Laurentian/Home/Departments/Library/help.htm">
-<!-- ALGOMA custom footer links -->\r
-<!ENTITY au.footer.databases "Databases">\r
-<!ENTITY au.footer.databases.url "http://www.algomau.ca/view.php?page=databases&parent=library">\r
-<!ENTITY au.footer.archives "Archives">\r
-<!ENTITY au.footer.archives.url "http://www.algomau.ca/view.php?page=collections&parent=library">\r
-<!ENTITY au.footer.contact "Contact Us">\r
-<!ENTITY au.footer.contact.url "http://www.algomau.ca/view.php?page=contactus&parent=library">\r
-<!ENTITY au.footer.library.about "About Us">\r
-<!ENTITY au.footer.library.about.url "http://www.algomau.ca/view.php?page=about&parent=library">\r
-<!ENTITY au.footer.library.home "Home">\r
-<!ENTITY au.footer.library.home.url "http://www.algomau.ca/view.php?page=about&parent=library">
+<!-- ALGOMA custom footer links -->
+<!ENTITY au.footer.databases "Databases">
+<!ENTITY au.footer.databases.url "http://www.algomau.ca/view.php?page=databases&amp;parent=library">
+<!ENTITY au.footer.archives "Archives">
+<!ENTITY au.footer.archives.url "http://www.algomau.ca/view.php?page=collections&amp;parent=library">
+<!ENTITY au.footer.contact "Contact Us">
+<!ENTITY au.footer.contact.url "http://www.algomau.ca/view.php?page=contactus&amp;parent=library">
+<!ENTITY au.footer.library.about "About Us">
+<!ENTITY au.footer.library.about.url "http://www.algomau.ca/view.php?page=about&amp;parent=library">
+<!ENTITY au.footer.library.home "Home">
+<!ENTITY au.footer.library.home.url "http://www.algomau.ca/view.php?page=about&amp;parent=library">

diff --git a/web/opac/locale/en-US/opac_conifer.dtd b/web/opac/locale/en-US/opac_conifer.dtd
index 440bda2..2d997e7 100644 (file)
--- a/web/opac/locale/en-US/opac_conifer.dtd
+++ b/web/opac/locale/en-US/opac_conifer.dtd
@@ -11,14 +11,14 @@
 <!ENTITY lu.footer.library.about "Home">
 <!ENTITY lu.footer.library.url "http://laurentian.ca/library">
 <!ENTITY lu.footer.help.url "http://laurentian.ca/Laurentian/Home/Departments/Library/help.htm">
-<!-- ALGOMA custom footer links -->\r
-<!ENTITY au.footer.databases "Databases">\r
-<!ENTITY au.footer.databases.url "http://www.algomau.ca/view.php?page=databases&parent=library">\r
-<!ENTITY au.footer.archives "Archives">\r
-<!ENTITY au.footer.archives.url "http://www.algomau.ca/view.php?page=collections&parent=library">\r
-<!ENTITY au.footer.contact "Contact Us">\r
-<!ENTITY au.footer.contact.url "http://www.algomau.ca/view.php?page=contactus&parent=library">\r
-<!ENTITY au.footer.library.about "About Us">\r
-<!ENTITY au.footer.library.about.url "http://www.algomau.ca/view.php?page=about&parent=library">\r
-<!ENTITY au.footer.library.home "Home">\r
-<!ENTITY au.footer.library.home.url "http://www.algomau.ca/view.php?page=about&parent=library">
+<!-- ALGOMA custom footer links -->
+<!ENTITY au.footer.databases "Databases">
+<!ENTITY au.footer.databases.url "http://www.algomau.ca/view.php?page=databases&amp;parent=library">
+<!ENTITY au.footer.archives "Archives">
+<!ENTITY au.footer.archives.url "http://www.algomau.ca/view.php?page=collections&amp;parent=library">
+<!ENTITY au.footer.contact "Contact Us">
+<!ENTITY au.footer.contact.url "http://www.algomau.ca/view.php?page=contactus&amp;parent=library">
+<!ENTITY au.footer.library.about "About Us">
+<!ENTITY au.footer.library.about.url "http://www.algomau.ca/view.php?page=about&amp;parent=library">
+<!ENTITY au.footer.library.home "Home">
+<!ENTITY au.footer.library.home.url "http://www.algomau.ca/view.php?page=about&amp;parent=library">

diff --git a/web/opac/locale/fr-CA/opac_conifer.dtd b/web/opac/locale/fr-CA/opac_conifer.dtd
index f809e59..0ae69c2 100644 (file)
--- a/web/opac/locale/fr-CA/opac_conifer.dtd
+++ b/web/opac/locale/fr-CA/opac_conifer.dtd
@@ -11,4 +11,14 @@
 <!ENTITY lu.footer.library.about "Accueil">
 <!ENTITY lu.footer.library.url "http://laurentienne.ca/library">
 <!ENTITY lu.footer.help.url "http://laurentienne.ca/Laurentian/Home/Departments/Library/help.htm">
-
+<!-- ALGOMA custom footer links -->
+<!ENTITY au.footer.databases "Bases de données">
+<!ENTITY au.footer.databases.url "http://www.algomau.ca/view.php?page=databases&amp;parent=library">
+<!ENTITY au.footer.archives "Archives">
+<!ENTITY au.footer.archives.url "http://www.algomau.ca/view.php?page=collections&amp;parent=library">
+<!ENTITY au.footer.contact "Contact Us">
+<!ENTITY au.footer.contact.url "http://www.algomau.ca/view.php?page=contactus&amp;parent=library">
+<!ENTITY au.footer.library.about "About Us">
+<!ENTITY au.footer.library.about.url "http://www.algomau.ca/view.php?page=about&amp;parent=library">
+<!ENTITY au.footer.library.home "Accueil">
+<!ENTITY au.footer.library.home.url "http://www.algomau.ca/view.php?page=about&amp;parent=library">