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

Markup cleanup, style tweaks and some refactoring of the home page for Wilma. Turns out that all requests for tabs were being routed to the new HomePageController since it had "/index.jsp" set as its url-pattern under the servlet-mapping in web.xml. This isn't going to work as it made every tab render using page-home.ftl. Restored TabController servlet mapping in web.xml temporarily and will discuss potential solutions with Rebecca. NIHVIVO-556 NIHVIVO-1234

Browse source
This commit is contained in:
nac26 2010-10-27 13:21:55 +00:00
parent 10c352dbf9
commit f7517ba34d
13 changed files with 1103 additions and 892 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,9 +51,6 @@
throw new JspException(e);
}
*/
// This is here as a safety net. We should have gotten the values in identity.jsp,
// since it's the first jsp we hit.
%>
@ -80,22 +77,38 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>${title}</title>
<link rel="stylesheet" href="<%=themeDir%>css/style.css" />
<head>
<meta charset="utf-8" />
<title>${title}</title>
<link rel="stylesheet" href="<%=themeDir%>css/style.css" />
<!-- script for enabling new HTML5 semantic markup in IE browsers-->
<%-- ${headScripts.add("/js/html5.js")} --%>
<c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
</head>
<body ${requestScope.bodyAttr}>
<div id="wrapper">
${ftl_menu}
<div id="wrapper-content">
<c:import url="${bodyJsp}"/>
</div>
${ftl_footer}
<!-- script for enabling new HTML5 semantic markup in IE browsers-->
<%-- ${headScripts.add("/js/html5.js")} --%>
<c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
<!--[if lt IE 7]>
<script type="text/javascript" src="<%=themeDir%>js/jquery_plugins/supersleight.js"></script>
<script type="text/javascript" src="<%=themeDir%>js/utils.js"></script>
<link rel="stylesheet" href="css/ie6.css" />
<![endif]-->
</body>
<!--[if IE 7]>
<link rel="stylesheet" href="css/ie7.css" />
<![endif]-->
<!--[if (gte IE 6)&(lte IE 8)]>
<script type="text/javascript" src="<%=themeDir%>js/selectivizr.js"></script>
<![endif]-->
</head>
<body ${requestScope.bodyAttr}>
<div id="wrapper">
${ftl_menu}
<div id="wrapper-content">
<c:import url="${bodyJsp}"/>
</div>
${ftl_footer}
</body>
</html>