diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java index 1fb9e19ac..5944e02ab 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java @@ -660,7 +660,7 @@ public class IndividualController extends FreemarkerHttpServlet { body.put("title","Individual Not Found"); body.put("errorMessage", "The individual was not found in the system."); - return new TemplateResponseValues(Template.TITLED_ERROR_MESSAGE.toString(), body, HttpServletResponse.SC_NOT_FOUND); + return new TemplateResponseValues(Template.TITLED_ERROR_MESSAGE.toString(), body); } } diff --git a/webapp/web/templates/freemarker/body/error/error-titled.ftl b/webapp/web/templates/freemarker/body/error/error-titled.ftl new file mode 100644 index 000000000..9e09d9b87 --- /dev/null +++ b/webapp/web/templates/freemarker/body/error/error-titled.ftl @@ -0,0 +1,7 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Standard template to display an error message with a title, generated from any controller. Keeps this out of individual templates. --> + +

${title}

+ +<#include "error-message.ftl"> \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/error/error-titledMessage.ftl b/webapp/web/templates/freemarker/body/error/error-titledMessage.ftl deleted file mode 100644 index 2bcf2cf68..000000000 --- a/webapp/web/templates/freemarker/body/error/error-titledMessage.ftl +++ /dev/null @@ -1,7 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#-- Standard template to display an error message generated from any controller. Keeps this out of individual templates. --> - -

${title}

- -<#include "errorMessage.ftl"> \ No newline at end of file