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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
themes/vivo-basic/css/screen.css
View file

@ -813,4 +813,8 @@ font-size:0.9em;
.contactUsReturnHome{
margin-top:30px;
margin-bottom:250px;
}
/* This css rules will override the one in individual.css */
.green {
color:#000 !important;
}

46
themes/vivo-basic/templates/page.ftl Normal file
View file

@ -0,0 +1,46 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#include "doctype.html">
${stylesheets.addFromTheme("/css/screen.css")}
<#-- print stylesheet commented out for now until we can add a media parameter to stylesheets.add method -->
<#-- ${stylesheets.addFromTheme("/css/print.css")} -->
<#include "head.ftl">
<body>
<div id="wrap" class="container">
<div id="header">
<#include "identity.ftl">
<#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->
<div id="navAndSearch" class="block">
<#include "menu.ftl">
<#include "search.ftl">
</div> <!-- navAndSearch -->
<#include "breadcrumbs.ftl">
</div> <!-- header -->
<hr class="hidden" />
<div id="contentwrap">
<#if flash?has_content>
<div id="flash-message">
${flash}
</div>
</#if>
<div id="content">
${body}
</div> <!-- content -->
</div> <!-- contentwrap -->
<#include "footer.ftl">
</div> <!-- wrap -->
<#include "scripts.ftl">
</body>
</html>

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]>