Index: ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/home/main/content.jsp =================================================================== --- ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/home/main/content.jsp (revision 27092) +++ ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/home/main/content.jsp (revision ) @@ -18,6 +18,6 @@

${symbol_dollar}{document.title}

I18n key example:

${symbol_dollar}{document.summary}

-

+ Index: ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/ErrorPage403.jsp =================================================================== --- ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/ErrorPage403.jsp (revision 27092) +++ ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/ErrorPage403.jsp (revision ) @@ -8,7 +8,11 @@ - + + + + <% String destination = (String) session.getAttribute("org.hippoecm.hst.security.servlet.destination"); if (destination == null) destination = ""; @@ -34,8 +38,6 @@ - - <c:choose> <c:when test="${accessForbidden}"> @@ -49,9 +51,6 @@ <meta http-equiv='refresh' content='<%=autoRedirectSeconds%>;url=${loginFormUrl}' /> <link rel="stylesheet" type="text/css" href="<hst:link path='/login/hst/security/skin/screen.css' />" /> <link rel="stylesheet" media="screen" type="text/css" href="<hst:link path='/login/hst/security/skin/css/help-overlay.css'/>" /> - <script src="<hst:link path='/login/hst/security/skin/js/jquery-1.4.2.min.js' />" type="text/javascript"></script> - <script src="<hst:link path='/login/hst/security/skin/js/jquery.tools.min.js' />" type="text/javascript"></script> - <script src="<hst:link path='/login/hst/security/skin/js/help-overlay.js' />" type="text/javascript"></script> </head> <body class="hippo-root"> <div> @@ -97,5 +96,8 @@ </div> </div> </div> + <script src="<hst:link path='/login/hst/security/skin/js/jquery-1.4.2.min.js' />" type="text/javascript"></script> + <script src="<hst:link path='/login/hst/security/skin/js/jquery.tools.min.js' />" type="text/javascript"></script> + <script src="<hst:link path='/login/hst/security/skin/js/help-overlay.js' />" type="text/javascript"></script> </body> </html> \ No newline at end of file Index: ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/standard/main/content.jsp =================================================================== --- ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/standard/main/content.jsp (revision 27092) +++ ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/standard/main/content.jsp (revision ) @@ -18,6 +18,6 @@ <h2>${symbol_dollar}{document.title}</h2> <p>${symbol_dollar}{document.summary}</p> -<p><hst:html hippohtml="${symbol_dollar}{document.html}"/></p> +<hst:html hippohtml="${symbol_dollar}{document.html}"/> Index: ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/ErrorPage500.jsp =================================================================== --- ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/ErrorPage500.jsp (revision 27092) +++ ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/ErrorPage500.jsp (revision ) @@ -3,14 +3,15 @@ <% response.setStatus(500); %> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>500 error -Server error +

Server error

<% out.println(""); %> Index: ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/component-error-page.jsp =================================================================== --- ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/component-error-page.jsp (revision 27092) +++ ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/component-error-page.jsp (revision ) @@ -1,8 +1,8 @@ <%@ page language="java" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - -
    +
      + -
    • ${componentException.message}
      • +
    • ${componentException.message}
      • -
    +
Index: ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/ErrorPage404.jsp =================================================================== --- ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/ErrorPage404.jsp (revision 27092) +++ ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/errorpages/ErrorPage404.jsp (revision ) @@ -3,13 +3,15 @@ <% response.setStatus(404); %> - - + + - + 404 error -Page not found!!! +

Page not found!!!

+

The page you requested was not found in this site.

\ No newline at end of file Index: ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/layout/webpage.jsp =================================================================== --- ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/layout/webpage.jsp (revision 27092) +++ ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/layout/webpage.jsp (revision ) @@ -9,17 +9,18 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/xml" prefix="x" %> <%@ taglib uri="http://www.hippoecm.org/jsp/hst/core" prefix='hst'%> - - + + - - - " type="text/css"> + + + " type="text/css"/> - + Index: ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/standard/main/leftmenu.jsp =================================================================== --- ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/standard/main/leftmenu.jsp (revision 27092) +++ ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/standard/main/leftmenu.jsp (revision ) @@ -25,7 +25,7 @@ - +
    @@ -46,7 +46,7 @@ - +
      Index: ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/css/style.css =================================================================== --- ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/css/style.css (revision 27090) +++ ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/css/style.css (revision ) @@ -1,5 +1,5 @@ body { - font-family: Verdana; + font-family: Verdana,Helvetica,sans-serif; } #content { @@ -33,10 +33,14 @@ } ul.hst-container { - padding:0px; - margin:0px; + padding:0; + margin:0; } ul.hst-container li { list-style-type:none; } + +@media print { +/* print specific styling here*/ +} \ No newline at end of file Index: ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/news/main/content.jsp =================================================================== --- ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/news/main/content.jsp (revision 27219) +++ ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/news/main/content.jsp (revision ) @@ -21,7 +21,7 @@

      ${symbol_dollar}{document.summary}

      -

      +

      Index: ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/overview/main/content.jsp =================================================================== --- ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/overview/main/content.jsp (revision 27219) +++ ../archetype/website/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/overview/main/content.jsp (revision ) @@ -24,12 +24,9 @@

    • ${symbol_dollar}{item.title}
      - -

      - + - +

      - + -

      ${symbol_dollar}{item.summary}