litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Committing files to VIVO. vivo-basic wasn't rendering property. Created page.ftl to property get the right style files.

Browse source
This commit is contained in:
mb863 2010-11-18 18:52:26 +00:00
parent 1f01b95140
commit b974e37445
5 changed files with 56 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
themes/wilma/templates/page-home.ftl
View file

@ -12,10 +12,8 @@
<title>${title}</title>
${stylesheets.addFromTheme("/css/screen.css")}
${stylesheets.tags}
<!-- script for enabling new HTML5 semantic markup in IE browsers-->
<script type="text/javascript" src="${urls.home}/js/html5.js"></script>
${headScripts.tags}
<#include "stylesheets.ftl">
<#include "headScripts.ftl">
<!--[if lt IE 7]>
<link rel="stylesheet" href="css/ie6.css" />

4
themes/wilma/templates/page.ftl
View file

@ -13,9 +13,7 @@
${stylesheets.addFromTheme("/css/screen.css")}
<#include "stylesheets.ftl">
<!-- script for enabling new HTML5 semantic markup in IE browsers-->
<script type="text/javascript" src="${urls.home}/js/html5.js"></script>
${headScripts.tags}
<#include "headScripts.ftl">
<!--[if lt IE 7]>
<link rel="stylesheet" href="css/ie6.css" />

6
themes/wilma/templates/page/basicPage.jsp
View file

@ -81,9 +81,9 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
<meta charset="utf-8" />
<title>${title}</title>
<link rel="stylesheet" href="<%=themeDir%>css/screen.css" />
<!-- script for enabling new HTML5 semantic markup in IE browsers-->
<%-- ${headScripts.add("/js/html5.js")} --%>
${ftl_stylesheets}
${ftl_headScripts}
<c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
<!--[if lt IE 7]>