diff --git a/pom.xml b/pom.xml index 6087b59f4c02a7390d9f586154fbe5ecb067bff3..c69e483ece1bb43366471f83e7f03c658e085f2e 100644 --- a/pom.xml +++ b/pom.xml @@ -354,6 +354,11 @@ opencsv 2.3 + + org.sitemesh + sitemesh + 3.0-alpha-2 + diff --git a/src/main/webapp/WEB-INF/decorator/main.jsp b/src/main/webapp/WEB-INF/decorator/main.jsp new file mode 100644 index 0000000000000000000000000000000000000000..82e4e74df14ac0b54525782212d1f623ba0bd2de --- /dev/null +++ b/src/main/webapp/WEB-INF/decorator/main.jsp @@ -0,0 +1,77 @@ +<%@include file="/WEB-INF/jsp/init.jsp"%> + + + + <sitemesh:write property="title" /> + <%@include file="/WEB-INF/jsp/head-init.jsp"%> + + <%--Locked Compatible Mode for IE--%> + + + + + + + + + + + + + + + + + + <%--Fallback for older browsers--%> + + + + + + + + + + + + + +
+ + +
+ + +
+ + +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/dataset/index.jsp b/src/main/webapp/WEB-INF/jsp/dataset/index.jsp index cc2c81dd0af78bc57ecaa1291a3895fbc27c2112..b890ea60a2efd212445f96c2a991f97bc7ac077a 100644 --- a/src/main/webapp/WEB-INF/jsp/dataset/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/dataset/index.jsp @@ -1,66 +1,17 @@ -<%@include file="../init.jsp"%> +<%@include file="/WEB-INF/jsp/init.jsp"%> - <%@include file="../head-init.jsp"%> - <spring:message code="sample.message.index.title"/> - - - - - <%--Fallback for older browsers--%> - - - - - - - - - -
- - -
- - -

- -
-
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/head-init.jsp b/src/main/webapp/WEB-INF/jsp/head-init.jsp index 47a16a609d5bc6b7baff744b3ff31c15103ef242..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/src/main/webapp/WEB-INF/jsp/head-init.jsp +++ b/src/main/webapp/WEB-INF/jsp/head-init.jsp @@ -1,14 +0,0 @@ - -<%--Locked Compatible Mode for IE--%> - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index abab6ca19bb00dae27ebc9e1fb78eac378d415aa..95893e7c96be12e7793d6d0ef5c00c59bf7c3e19 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -4,23 +4,7 @@ - <%@include file="head-init.jsp"%> - <spring:message code="sample.message.index.title"/> - - - - - <%--Fallback for older browsers--%> - - - - - - - - - <%@include file="handelbars-scripts.jsp" %>