From 9e583a620599bd0239cefd1dfcb2152e45bc98fd Mon Sep 17 00:00:00 2001 From: mb863 Date: Thu, 2 Dec 2010 20:57:20 +0000 Subject: [PATCH] NIHVIVO-556: Added screen.css to theme level --- themes/wilma/templates/edit/formPrefix.jsp | 2 +- themes/wilma/templates/page-home.ftl | 11 +++++------ themes/wilma/templates/page.ftl | 6 ++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/themes/wilma/templates/edit/formPrefix.jsp b/themes/wilma/templates/edit/formPrefix.jsp index e99a76c2..77dcac59 100644 --- a/themes/wilma/templates/edit/formPrefix.jsp +++ b/themes/wilma/templates/edit/formPrefix.jsp @@ -42,10 +42,10 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); - <%-- ${headScripts.add("/js/html5.js")} --%> + <% String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false"; if (useTinyMCE.equalsIgnoreCase("true")) { diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl index 96ca1e53..441eec46 100644 --- a/themes/wilma/templates/page-home.ftl +++ b/themes/wilma/templates/page-home.ftl @@ -12,13 +12,12 @@ ${title} - - <#-- ${stylesheets.addFromTheme("/css/screen.css")} --> + <#include "stylesheets.ftl"> <#include "headScripts.ftl"> - + @@ -26,7 +25,7 @@ - + @@ -40,7 +39,7 @@