From 661b1e7c88af0f6e09403cd438657dbddf9784fb Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Thu, 17 Dec 2015 16:22:18 +0000 Subject: [PATCH 1/8] Add JSP dependencies --- dependencies/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index ac9f7442d..a26483cfb 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -214,6 +214,18 @@ antisamy 1.4.4 + + + taglibs + standard + 1.1.2 + + + + javax.servlet.jsp.jstl + jstl-api + 1.2 + org.vivoweb.dependencies From f3fb439c15c535570f9c6092a0c17c21f44d207d Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Thu, 17 Dec 2015 19:34:17 +0000 Subject: [PATCH 2/8] Change DWR dependency to an unreleased version, due to session errors --- dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index a26483cfb..68f463059 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -192,7 +192,7 @@ org.directwebremoting dwr - 2.0.8 + 2.0.M2.8 org.freemarker From 11d8a914696eb102ecb8722fd59eb08f2f67ab51 Mon Sep 17 00:00:00 2001 From: Ted Lawless Date: Wed, 6 Jan 2016 14:20:43 -0500 Subject: [PATCH 3/8] Move yasqe js to required location. --- webapp/{web => src/main/webapp}/js/sparql/init-yasqe.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename webapp/{web => src/main/webapp}/js/sparql/init-yasqe.js (100%) diff --git a/webapp/web/js/sparql/init-yasqe.js b/webapp/src/main/webapp/js/sparql/init-yasqe.js similarity index 100% rename from webapp/web/js/sparql/init-yasqe.js rename to webapp/src/main/webapp/js/sparql/init-yasqe.js From 074d9f98cf09b16fd7e1d7c6f4ffac862c05f234 Mon Sep 17 00:00:00 2001 From: "Ariel D. Moya Sequeira" Date: Fri, 8 Jan 2016 10:04:35 -0600 Subject: [PATCH 4/8] Adds UTF-8 charset to emails --- .../mannlib/vitro/webapp/controller/MailUsersServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java index 161b1c70d..6cf698e6a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java @@ -171,7 +171,7 @@ public class MailUsersServlet extends VitroHttpServlet { msg.setSubject( deliveryfrom ); // add the multipart to the message - msg.setContent(msgText,"text/html"); + msg.setContent(msgText,"text/html; charset=UTF-8"); // set the Date: header msg.setSentDate( new Date() ); From 9a2cc3a9cc8fd7c25be9015fd578d0ca6a673517 Mon Sep 17 00:00:00 2001 From: "Ariel D. Moya Sequeira" Date: Fri, 8 Jan 2016 10:05:28 -0600 Subject: [PATCH 5/8] Adds UTF-8 charset to emails --- .../webapp/controller/freemarker/ContactMailController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java index 4a275a607..2c3cdcbc4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java @@ -276,7 +276,7 @@ public class ContactMailController extends FreemarkerHttpServlet { msg.setSubject( deliveryfrom ); // add the multipart to the message - msg.setContent(msgText,"text/html"); + msg.setContent(msgText,"text/html; charset=UTF-8"); // set the Date: header msg.setSentDate( new Date() ); From 8660ed91eb8e5c45a4077ffdb11710a4bda8a402 Mon Sep 17 00:00:00 2001 From: "Ariel D. Moya Sequeira" Date: Fri, 8 Jan 2016 10:06:20 -0600 Subject: [PATCH 6/8] Adds UTF-8 charset to emails --- .../vitro/webapp/email/FreemarkerEmailMessage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java index 710242dd9..b770be6c8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java @@ -172,15 +172,15 @@ public class FreemarkerEmailMessage { if (htmlContent.isEmpty()) { log.error("Message has neither text body nor HTML body"); } else { - msg.setContent(htmlContent, "text/html"); + msg.setContent(htmlContent, "text/html; charset=UTF-8"); } } else { if (htmlContent.isEmpty()) { - msg.setContent(textContent, "text/plain"); + msg.setContent(textContent, "text/plain; charset=UTF-8"); } else { MimeMultipart content = new MimeMultipart("alternative"); - addBodyPart(content, textContent, "text/plain"); - addBodyPart(content, htmlContent, "text/html"); + addBodyPart(content, textContent, "text/plain; charset=UTF-8"); + addBodyPart(content, htmlContent, "text/html; charset=UTF-8"); msg.setContent(content); } } From 950aecf7ab9022fe37e5688ddc27b5ba567dc6e1 Mon Sep 17 00:00:00 2001 From: "Ariel D. Moya Sequeira" Date: Fri, 8 Jan 2016 10:07:12 -0600 Subject: [PATCH 7/8] Adds UTF-8 charset to emails --- .../java/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java index 1604dbeae..19a19e634 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java @@ -56,7 +56,7 @@ public class MailUtil { msg.setSubject( subject ); // add the multipart to the message - msg.setContent(messageText,"text/html"); + msg.setContent(messageText,"text/html; charset=UTF-8"); // set the Date: header msg.setSentDate( new Date() ); From 9ff3dd5e11ae9ee96516c79289ba559caab1289d Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Thu, 21 Jan 2016 15:55:49 +0000 Subject: [PATCH 8/8] [VIVO-1226] bug fix for search help back link --- .../languages/es_GO/templates/freemarker/search-help_es_GO.ftl | 3 ++- .../webapp/templates/freemarker/body/search/search-help.ftl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/legacy/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl b/legacy/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl index bde61733d..f637add43 100644 --- a/legacy/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl +++ b/legacy/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl @@ -34,8 +34,9 @@ ${stylesheets.add('' $('a#closeLink').click(function() { $('ul#advanced').css("visibility","hidden"); $('a#closeLink').css("visibility","hidden"); + return false; }); - + return false; }); }); diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl index e6bb9146d..7ed23c8a7 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl @@ -34,8 +34,9 @@ ${stylesheets.add('' $('a#closeLink').click(function() { $('ul#advanced').css("visibility","hidden"); $('a#closeLink').css("visibility","hidden"); + return false; }); - + return false; }); });