Chybové stránky – stejný styl/vzhled jako zbytek webu.
authorFrantišek Kučera <franta-hg@frantovo.cz>
Thu Mar 18 14:33:35 2010 +0100 (2010-03-18)
changeset 74aec1fb81580e
parent 73 34c7eb5f2fae
child 75 18ed62105526
Chybové stránky – stejný styl/vzhled jako zbytek webu.
java/nekurak.net-web/web/WEB-INF/chyby/404.jsp
java/nekurak.net-web/web/WEB-INF/chyby/500.jsp
java/nekurak.net-web/web/WEB-INF/chyby/sablona.jsp
java/nekurak.net-web/web/index.jsp
     1.1 --- a/java/nekurak.net-web/web/WEB-INF/chyby/404.jsp	Thu Mar 18 14:22:16 2010 +0100
     1.2 +++ b/java/nekurak.net-web/web/WEB-INF/chyby/404.jsp	Thu Mar 18 14:33:35 2010 +0100
     1.3 @@ -1,16 +1,19 @@
     1.4  <?xml version="1.0" encoding="UTF-8"?>
     1.5  <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
     1.6  	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
     1.7 +	  xmlns:c="http://java.sun.com/jsp/jstl/core"
     1.8 +	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
     1.9  	  version="2.0">
    1.10 +    <jsp:directive.page contentType="application/xhtml+xml" isErrorPage="true"/>
    1.11  
    1.12      <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
    1.13  
    1.14      <fmt:message key="chybovaStranka.404.nazev" var="nazev"/>
    1.15      <fmt:message key="chybovaStranka.404.popis" var="popis"/>
    1.16 -    
    1.17 -    <jsp:include page="sablona.jsp" flush="false">
    1.18 -	<jsp:param name="nazev" value="${nazev}"/>
    1.19 -	<jsp:param name="popis" value="${popis}"/>
    1.20 -    </jsp:include>
    1.21 +
    1.22 +    <nk:stranka titulek="${nazev}">
    1.23 +	<h1><c:out value="${nazev}" /></h1>
    1.24 +	<p class="chybovaHlaska"><c:out value="${popis}" /></p>
    1.25 +    </nk:stranka>
    1.26  
    1.27  </jsp:root>
     2.1 --- a/java/nekurak.net-web/web/WEB-INF/chyby/500.jsp	Thu Mar 18 14:22:16 2010 +0100
     2.2 +++ b/java/nekurak.net-web/web/WEB-INF/chyby/500.jsp	Thu Mar 18 14:33:35 2010 +0100
     2.3 @@ -1,16 +1,19 @@
     2.4  <?xml version="1.0" encoding="UTF-8"?>
     2.5  <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
     2.6  	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
     2.7 +	  xmlns:c="http://java.sun.com/jsp/jstl/core"
     2.8 +	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
     2.9  	  version="2.0">
    2.10 +    <jsp:directive.page contentType="application/xhtml+xml" isErrorPage="true"/>
    2.11  
    2.12      <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
    2.13  
    2.14      <fmt:message key="chybovaStranka.500.nazev" var="nazev"/>
    2.15      <fmt:message key="chybovaStranka.500.popis" var="popis"/>
    2.16 -    
    2.17 -    <jsp:include page="sablona.jsp" flush="false">
    2.18 -	<jsp:param name="nazev" value="${nazev}"/>
    2.19 -	<jsp:param name="popis" value="${popis}"/>
    2.20 -    </jsp:include>
    2.21 +
    2.22 +    <nk:stranka titulek="${nazev}">
    2.23 +	<h1><c:out value="${nazev}" /></h1>
    2.24 +	<p class="chybovaHlaska"><c:out value="${popis}" /></p>
    2.25 +    </nk:stranka>
    2.26  
    2.27  </jsp:root>
     3.1 --- a/java/nekurak.net-web/web/WEB-INF/chyby/sablona.jsp	Thu Mar 18 14:22:16 2010 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,19 +0,0 @@
     3.4 -<?xml version="1.0" encoding="UTF-8"?>
     3.5 -<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
     3.6 -	  version="2.0">
     3.7 -    <jsp:directive.page contentType="application/xhtml+xml" isErrorPage="true"/>
     3.8 -    <jsp:output doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
     3.9 -		doctype-root-element="html"
    3.10 -		omit-xml-declaration="false"/>
    3.11 -
    3.12 -    <html xmlns="http://www.w3.org/1999/xhtml">
    3.13 -	<head>
    3.14 -	    <title>${param.nazev}</title>
    3.15 -	</head>
    3.16 -	<body>
    3.17 -	    <h1>${param.nazev}</h1>
    3.18 -	    <p>${param.popis}</p>
    3.19 -	</body>
    3.20 -    </html>
    3.21 -
    3.22 -</jsp:root>
     4.1 --- a/java/nekurak.net-web/web/index.jsp	Thu Mar 18 14:22:16 2010 +0100
     4.2 +++ b/java/nekurak.net-web/web/index.jsp	Thu Mar 18 14:33:35 2010 +0100
     4.3 @@ -5,7 +5,7 @@
     4.4  	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
     4.5  	  version="2.0">
     4.6      <jsp:directive.page contentType="application/xhtml+xml"/>
     4.7 -    
     4.8 +
     4.9      <!-- <lokalizace> -->
    4.10      <c:if test="${param.jazyk != null}">
    4.11  	<fmt:setLocale value="${param.jazyk}" scope="session"/>