# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1268918536 -3600
# Node ID 34c7eb5f2faecc0e9deac300570c4e80eb2bd867
# Parent  81c64c582a26e1cf645429e0447deaca9badf8a7
Přesun XHTML šablony do značky <nk:stranka/>
→ každá stránka teď může mít vlastní titulek (v html/head).

diff -r 81c64c582a26 -r 34c7eb5f2fae java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties
--- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties	Tue Mar 16 14:33:05 2010 +0100
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties	Thu Mar 18 14:22:16 2010 +0100
@@ -30,6 +30,7 @@
 
 prihlaseni.odhlaseniUspesne=Odhl\u00E1\u0161en\u00ED prob\u011Bhlo \u00FAsp\u011B\u0161n\u011B.
 prihlaseni.nadpis=P\u0159ihl\u00E1\u0161en\u00ED
+prihlaseni.nadpis.odhlaseni=Odhl\u00E1\u0161en\u00ED
 prihlaseni.zadejte=Zadejte jm\u00E9no a heslo.
 prihlaseni.chyba=Nespr\u00E1vn\u00E9 jm\u00E9no nebo heslo, zkuste to pros\u00EDm znovu.
 prihlaseni.jmeno=Jm\u00E9no
diff -r 81c64c582a26 -r 34c7eb5f2fae java/nekurak.net-web/web/WEB-INF/casti/detail.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/detail.jsp	Tue Mar 16 14:33:05 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/casti/detail.jsp	Thu Mar 18 14:22:16 2010 +0100
@@ -3,8 +3,11 @@
 	  xmlns:c="http://java.sun.com/jsp/jstl/core"
 	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
 	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
 	  version="2.0">
 
-    <p>TODO: Detail podniku (<c:out value="${param.podnik}"/>).</p>
+    <nk:stranka titulek="TODO: Detail podniku">
+	<p>TODO: Detail podniku (<c:out value="${param.podnik}"/>).</p>
+    </nk:stranka>
 
 </jsp:root>
diff -r 81c64c582a26 -r 34c7eb5f2fae java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp	Tue Mar 16 14:33:05 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp	Thu Mar 18 14:22:16 2010 +0100
@@ -3,47 +3,50 @@
 	  xmlns:c="http://java.sun.com/jsp/jstl/core"
 	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
 	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
 	  version="2.0">
 
     <jsp:useBean id="podnik" class="cz.frantovo.nekurak.dto.Podnik" scope="request"/>
     <jsp:useBean id="pridatPodnik" class="cz.frantovo.nekurak.web.PridatPodnik" scope="request"/>
 
-    <h1><fmt:message key="pridatPodnik.nadpis"/></h1>
+    <fmt:message key="pridatPodnik.nadpis" var="titulekStranky"/>
+    <nk:stranka titulek="${titulekStranky}">
 
-    <c:choose>
-	<c:when test="${param.akcePridat == 'pridej'}">
-	    <c:catch var="pridatPodnikChyba">
-		<jsp:setProperty name="podnik" property="*"/>
-		<jsp:setProperty name="pridatPodnik" property="podnik" value="${podnik}"/>
-		<c:set var="pridatPodnikOK" value="${pridatPodnik.pridano}"/>
-	    </c:catch>
-	    <c:choose>
-		<c:when test="${pridatPodnikChyba == null}">
-		    <p><fmt:message key="pridatPodnik.bylPridan"/></p>
-		</c:when>
-		<c:otherwise>
-		    <p class="chybovaHlaska"><fmt:message key="pridatPodnik.nebylPridan"/></p>
-		</c:otherwise>
-	    </c:choose>
-	</c:when>
-	<c:otherwise>
-	    <form method="post" action="?akce=pridatPodnik&amp;amp;akcePridat=pridej">
-		<fieldset>
-		    <label><fmt:message key="dto.podnik.nazev"/>: <input type="text" name="nazev" maxlength="255"/></label><br/>
-		    <label><fmt:message key="dto.podnik.popis"/>: <input type="text" name="popis" maxlength="255"/></label><br/>
-			<fmt:message key="dto.podnik.url.tip" var="urlTip"/>
-		    <label title="${urlTip}"><fmt:message key="dto.podnik.url"/>: <input type="text" name="url" maxlength="255"/></label><br/>
-		    <label><fmt:message key="dto.podnik.ulice"/>: <input type="text" name="ulice" maxlength="64"/></label><br/>
-			<fmt:message key="dto.podnik.cisloPopisne.tip" var="cisloPopisneTip"/>
-		    <label title="${cisloPopisneTip}"><fmt:message key="dto.podnik.cisloPopisne"/>: <input type="text" name="cisloPopisne" maxlength="5"/></label><br/>
-		    <label><fmt:message key="dto.podnik.mesto"/>: <input type="text" name="mesto" maxlength="64"/></label><br/>
-		    <button value="submit"><fmt:message key="pridatPodnik.tlacitko"/></button>
-		</fieldset>
-	    </form>
-	</c:otherwise>
-    </c:choose>
+	<h1><c:out value="${titulekStranky}"/></h1>
 
+	<c:choose>
+	    <c:when test="${param.akcePridat == 'pridej'}">
+		<c:catch var="pridatPodnikChyba">
+		    <jsp:setProperty name="podnik" property="*"/>
+		    <jsp:setProperty name="pridatPodnik" property="podnik" value="${podnik}"/>
+		    <c:set var="pridatPodnikOK" value="${pridatPodnik.pridano}"/>
+		</c:catch>
+		<c:choose>
+		    <c:when test="${pridatPodnikChyba == null}">
+			<p><fmt:message key="pridatPodnik.bylPridan"/></p>
+		    </c:when>
+		    <c:otherwise>
+			<p class="chybovaHlaska"><fmt:message key="pridatPodnik.nebylPridan"/></p>
+		    </c:otherwise>
+		</c:choose>
+	    </c:when>
+	    <c:otherwise>
+		<form method="post" action="?akce=pridatPodnik&amp;amp;akcePridat=pridej">
+		    <fieldset>
+			<label><fmt:message key="dto.podnik.nazev"/>: <input type="text" name="nazev" maxlength="255"/></label><br/>
+			<label><fmt:message key="dto.podnik.popis"/>: <input type="text" name="popis" maxlength="255"/></label><br/>
+			    <fmt:message key="dto.podnik.url.tip" var="urlTip"/>
+			<label title="${urlTip}"><fmt:message key="dto.podnik.url"/>: <input type="text" name="url" maxlength="255"/></label><br/>
+			<label><fmt:message key="dto.podnik.ulice"/>: <input type="text" name="ulice" maxlength="64"/></label><br/>
+			    <fmt:message key="dto.podnik.cisloPopisne.tip" var="cisloPopisneTip"/>
+			<label title="${cisloPopisneTip}"><fmt:message key="dto.podnik.cisloPopisne"/>: <input type="text" name="cisloPopisne" maxlength="5"/></label><br/>
+			<label><fmt:message key="dto.podnik.mesto"/>: <input type="text" name="mesto" maxlength="64"/></label><br/>
+			<button value="submit"><fmt:message key="pridatPodnik.tlacitko"/></button>
+		    </fieldset>
+		</form>
+	    </c:otherwise>
+	</c:choose>
 
-
+    </nk:stranka>
 
 </jsp:root>
diff -r 81c64c582a26 -r 34c7eb5f2fae java/nekurak.net-web/web/WEB-INF/casti/prihlaseni.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/prihlaseni.jsp	Tue Mar 16 14:33:05 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/casti/prihlaseni.jsp	Thu Mar 18 14:22:16 2010 +0100
@@ -3,34 +3,36 @@
 	  xmlns:c="http://java.sun.com/jsp/jstl/core"
 	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
 	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
 	  version="2.0">
 
-    <jsp:useBean id="podnik" class="cz.frantovo.nekurak.dto.Podnik" scope="request"/>
-    <jsp:useBean id="pridatPodnik" class="cz.frantovo.nekurak.web.PridatPodnik" scope="request"/>
-
-
     <c:choose>
 	<c:when test="${param.odhlasit == 'ano'}">
-	    <p><fmt:message key="prihlaseni.odhlaseniUspesne"/></p>
+	    <fmt:message key="prihlaseni.nadpis.odhlaseni" var="titulekStranky"/>
+	    <nk:stranka titulek="${titulekStranky}">
+		<p><fmt:message key="prihlaseni.odhlaseniUspesne"/></p>
+	    </nk:stranka>
 	</c:when>
 	<c:otherwise>
-	    <h1><fmt:message key="prihlaseni.nadpis"/></h1>
-	    <p><fmt:message key="prihlaseni.zadejte"/></p>
+	    <fmt:message key="prihlaseni.nadpis" var="titulekStranky"/>
+	    <nk:stranka titulek="${titulekStranky}">
+		<h1><c:out value="${titulekStranky}"/></h1>
+		<p><fmt:message key="prihlaseni.zadejte"/></p>
 
-	    <c:if test="${param.chyba == 'ano'}">
-		<p class="chybovaHlaska"><fmt:message key="prihlaseni.chyba"/></p>
-	    </c:if>
+		<c:if test="${param.chyba == 'ano'}">
+		    <p class="chybovaHlaska"><fmt:message key="prihlaseni.chyba"/></p>
+		</c:if>
 
-	    <form method="post" action="j_security_check">
-		<fieldset>
-		    <label><fmt:message key="prihlaseni.jmeno"/>: <input type="text" name="j_username"/></label><br/>
-		    <label><fmt:message key="prihlaseni.heslo"/>: <input type="password" name="j_password"/></label><br/>
-		    <button value="submit"><fmt:message key="prihlaseni.tlacitko"/></button>
-		</fieldset>
-	    </form>
+		<form method="post" action="j_security_check">
+		    <fieldset>
+			<label><fmt:message key="prihlaseni.jmeno"/>: <input type="text" name="j_username"/></label><br/>
+			<label><fmt:message key="prihlaseni.heslo"/>: <input type="password" name="j_password"/></label><br/>
+			<button value="submit"><fmt:message key="prihlaseni.tlacitko"/></button>
+		    </fieldset>
+		</form>
+	    </nk:stranka>
 	</c:otherwise>
     </c:choose>
 
 
-
 </jsp:root>
diff -r 81c64c582a26 -r 34c7eb5f2fae java/nekurak.net-web/web/WEB-INF/casti/registrovatUzivatele.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/registrovatUzivatele.jsp	Tue Mar 16 14:33:05 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/casti/registrovatUzivatele.jsp	Thu Mar 18 14:22:16 2010 +0100
@@ -3,88 +3,94 @@
 	  xmlns:c="http://java.sun.com/jsp/jstl/core"
 	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
 	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
 	  version="2.0">
 
     <jsp:useBean id="uzivatel" class="cz.frantovo.nekurak.dto.PozadavekNaRegistraciUzivatele" scope="request"/>
     <jsp:useBean id="uzivatelPredRegistraci" class="cz.frantovo.nekurak.web.UzivatelPredRegistraci" scope="request"/>
     <jsp:useBean id="registraceUzivatele" class="cz.frantovo.nekurak.web.RegistraceUzivatele" scope="session"/>
 
-    <h1><fmt:message key="registrace.nadpis"/></h1>
+    <fmt:message key="registrace.nadpis" var="titulekStranky"/>
+    <nk:stranka titulek="${titulekStranky}">
 
-    <!--
-    Registrace probíhá ve třech krocích:
+	<h1><c:out value="${titulekStranky}"/></h1>
+
+	<!--
+	Registrace probíhá ve třech krocích:
 	1) uživatel vyplňí formulář
 	2) zobrazíme mu vyplněné údaje a on si je zkontroluje
-        3) potvrdí registraci
-    -->
+	3) potvrdí registraci
+	-->
 
-    <c:choose>
-	<c:when test="${param.akceRegistrace == 'kontrola'}">
-	    <!-- Vypíšeme uživateli údaje, které zadal do formuláře, aby si je mohl zkontrolovat. -->
-	    <c:choose>
-		<c:when test="${param.heslo == param.heslo_kontrola}">
-		    <jsp:setProperty name="uzivatel" property="*"/>
-		    <jsp:setProperty name="uzivatelPredRegistraci" property="uzivatel" value="${uzivatel}"/>
-		    <jsp:setProperty name="registraceUzivatele" property="uzivatel" value="${uzivatelPredRegistraci}"/>
+	<c:choose>
+	    <c:when test="${param.akceRegistrace == 'kontrola'}">
+		<!-- Vypíšeme uživateli údaje, které zadal do formuláře, aby si je mohl zkontrolovat. -->
+		<c:choose>
+		    <c:when test="${param.heslo == param.heslo_kontrola}">
+			<jsp:setProperty name="uzivatel" property="*"/>
+			<jsp:setProperty name="uzivatelPredRegistraci" property="uzivatel" value="${uzivatel}"/>
+			<jsp:setProperty name="registraceUzivatele" property="uzivatel" value="${uzivatelPredRegistraci}"/>
 
-		    <p><fmt:message key="registrace.kontrola"/></p>
+			<p><fmt:message key="registrace.kontrola"/></p>
 
-		    <p class="registraceKontrolaUdaju">
-			<fmt:message key="dto.uzivatel.prezdivka"/>: <c:out value="${uzivatel.prezdivka}"/><br/>
-			<fmt:message key="dto.uzivatel.jmeno"/>: <c:out value="${uzivatel.jmeno}"/><br/>
-			<fmt:message key="dto.uzivatel.prijmeni"/>: <c:out value="${uzivatel.prijmeni}"/><br/>
-			<fmt:message key="dto.uzivatel.email"/>: <c:out value="${uzivatel.email}"/><br/>
-		    </p>
+			<p class="registraceKontrolaUdaju">
+			    <fmt:message key="dto.uzivatel.prezdivka"/>: <c:out value="${uzivatel.prezdivka}"/><br/>
+			    <fmt:message key="dto.uzivatel.jmeno"/>: <c:out value="${uzivatel.jmeno}"/><br/>
+			    <fmt:message key="dto.uzivatel.prijmeni"/>: <c:out value="${uzivatel.prijmeni}"/><br/>
+			    <fmt:message key="dto.uzivatel.email"/>: <c:out value="${uzivatel.email}"/><br/>
+			</p>
 
-		    <p>
-			<a href="?akce=registrovatUzivatele&amp;amp;akceRegistrace=dokonceni&amp;amp;token=${fn:escapeXml(uzivatelPredRegistraci.token)}">
-			    <fmt:message key="registrace.potvrdit"/>
-			</a>
-		    </p>
-		</c:when>
-		<c:otherwise>
-		    <p class="chybovaHlaska"><fmt:message key="registrace.vyjimka.heslaSeNeshoduji"/></p>
-		</c:otherwise>
-	    </c:choose>
-	</c:when>
-	<c:when test="${param.akceRegistrace == 'dokonceni'}">
-	    <!-- Uživatel si zkontroloval údaje a chce dokončit svoji registraci. -->
-	    <jsp:setProperty name="registraceUzivatele" property="token" value="${param.token}"/>
+			<p>
+			    <a href="?akce=registrovatUzivatele&amp;amp;akceRegistrace=dokonceni&amp;amp;token=${fn:escapeXml(uzivatelPredRegistraci.token)}">
+				<fmt:message key="registrace.potvrdit"/>
+			    </a>
+			</p>
+		    </c:when>
+		    <c:otherwise>
+			<p class="chybovaHlaska"><fmt:message key="registrace.vyjimka.heslaSeNeshoduji"/></p>
+		    </c:otherwise>
+		</c:choose>
+	    </c:when>
+	    <c:when test="${param.akceRegistrace == 'dokonceni'}">
+		<!-- Uživatel si zkontroloval údaje a chce dokončit svoji registraci. -->
+		<jsp:setProperty name="registraceUzivatele" property="token" value="${param.token}"/>
 
-	    <c:set var="chybaRegistrace" value="${registraceUzivatele.dokonciRegistraci}"/>
+		<c:set var="chybaRegistrace" value="${registraceUzivatele.dokonciRegistraci}"/>
 
-	    <c:choose>
-		<c:when test="${chybaRegistrace == null}">
-		    <!-- Registrace proběhla úspěšně. -->
-		    <p>
-			<fmt:message key="registrace.hotovo"/>&amp;#160;
-			<a href="?akce=prihlaseni">
-			    <fmt:message key="registrace.hotovo.prihlasit"/>
-			</a>.
-		    </p>
-		</c:when>
-		<c:otherwise>
-		    <!-- Během pokusu o registraci uživatele došlo k chybě. -->
-		    <p class="chybovaHlaska"><fmt:message key="${chybaRegistrace}"/></p>
-		</c:otherwise>
-	    </c:choose>
-	</c:when>
-	<c:otherwise>
-	    <!-- Zobrazíme uživateli registrační formulář. -->
-	    <form method="post" action="?akce=registrovatUzivatele&amp;amp;akceRegistrace=kontrola">
-		<fieldset>
-		    <fmt:message key="dto.uzivatel.prezdivka.tip" var="prezdivkaTip"/>
-		    <label title="${prezdivkaTip}"><fmt:message key="dto.uzivatel.prezdivka"/>: <input type="text" name="prezdivka" maxlength="255"/></label><br/>
-		    <label><fmt:message key="dto.uzivatel.heslo"/>: <input type="password" name="heslo" maxlength="255"/></label><br/>
-		    <label><fmt:message key="dto.uzivatel.heslo.kontrola"/>: <input type="password" name="heslo_kontrola" maxlength="255"/></label><br/>
-		    <br/>
-		    <label><fmt:message key="dto.uzivatel.jmeno"/>: <input type="text" name="jmeno" maxlength="255"/></label><br/>
-		    <label><fmt:message key="dto.uzivatel.prijmeni"/>: <input type="text" name="prijmeni" maxlength="255"/></label><br/>
-		    <label><fmt:message key="dto.uzivatel.email"/>: <input type="text" name="email" maxlength="255"/></label><br/>
-		    <button value="submit"><fmt:message key="registrace.tlacitko"/></button>
-		</fieldset>
-	    </form>
-	</c:otherwise>
-    </c:choose>
+		<c:choose>
+		    <c:when test="${chybaRegistrace == null}">
+			<!-- Registrace proběhla úspěšně. -->
+			<p>
+			    <fmt:message key="registrace.hotovo"/>&amp;#160;
+			    <a href="?akce=prihlaseni">
+				<fmt:message key="registrace.hotovo.prihlasit"/>
+			    </a>.
+			</p>
+		    </c:when>
+		    <c:otherwise>
+			<!-- Během pokusu o registraci uživatele došlo k chybě. -->
+			<p class="chybovaHlaska"><fmt:message key="${chybaRegistrace}"/></p>
+		    </c:otherwise>
+		</c:choose>
+	    </c:when>
+	    <c:otherwise>
+		<!-- Zobrazíme uživateli registrační formulář. -->
+		<form method="post" action="?akce=registrovatUzivatele&amp;amp;akceRegistrace=kontrola">
+		    <fieldset>
+			<fmt:message key="dto.uzivatel.prezdivka.tip" var="prezdivkaTip"/>
+			<label title="${prezdivkaTip}"><fmt:message key="dto.uzivatel.prezdivka"/>: <input type="text" name="prezdivka" maxlength="255"/></label><br/>
+			<label><fmt:message key="dto.uzivatel.heslo"/>: <input type="password" name="heslo" maxlength="255"/></label><br/>
+			<label><fmt:message key="dto.uzivatel.heslo.kontrola"/>: <input type="password" name="heslo_kontrola" maxlength="255"/></label><br/>
+			<br/>
+			<label><fmt:message key="dto.uzivatel.jmeno"/>: <input type="text" name="jmeno" maxlength="255"/></label><br/>
+			<label><fmt:message key="dto.uzivatel.prijmeni"/>: <input type="text" name="prijmeni" maxlength="255"/></label><br/>
+			<label><fmt:message key="dto.uzivatel.email"/>: <input type="text" name="email" maxlength="255"/></label><br/>
+			<button value="submit"><fmt:message key="registrace.tlacitko"/></button>
+		    </fieldset>
+		</form>
+	    </c:otherwise>
+	</c:choose>
+
+    </nk:stranka>
 
 </jsp:root>
diff -r 81c64c582a26 -r 34c7eb5f2fae java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp	Tue Mar 16 14:33:05 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp	Thu Mar 18 14:22:16 2010 +0100
@@ -8,43 +8,47 @@
 
     <jsp:useBean id="uvod" class="cz.frantovo.nekurak.web.Uvod" scope="request"/>
 
-    <p><fmt:message key="uvod.naposledyPridanePodniky"/>:</p>
+    <nk:stranka>
 
-    <script type="text/javascript" src="js/fotkyPodniku.js"></script>
+	<p><fmt:message key="uvod.naposledyPridanePodniky"/>:</p>
 
-    <c:forEach var="p" items="${uvod.podniky}">
-	<div class="podnik">
-	    <!-- Tři bloky vedle sebe -->
+	<script type="text/javascript" src="js/fotkyPodniku.js"></script>
 
-	    <!-- Název a adresa podniku -->
-	    <div class="adresa">
-		<h2><a href="?akce=detail&amp;amp;podnik=${p.id}"><c:out value="${p.nazev}"/></a></h2>
-		<p><c:out value="${p.popis}"/></p>
-		<p>
-		    <fmt:message key="uvod.adresa"/>:<br/>
-		    <c:out value="${p.ulice}"/>&amp;#160;
-		    <c:out value="${p.cisloPopisne}"/><br/>
-		    <c:out value="${p.mesto}"/>
-		</p>
-		<c:if test="${p.url != null}">
-		    <p><a href="${fn:escapeXml(p.url)}"><fmt:message key="uvod.www"/></a></p>
-		</c:if>
+	<c:forEach var="p" items="${uvod.podniky}">
+	    <div class="podnik">
+		<!-- Tři bloky vedle sebe -->
+
+		<!-- Název a adresa podniku -->
+		<div class="adresa">
+		    <h2><a href="?akce=detail&amp;amp;podnik=${p.id}"><c:out value="${p.nazev}"/></a></h2>
+		    <p><c:out value="${p.popis}"/></p>
+		    <p>
+			<fmt:message key="uvod.adresa"/>:<br/>
+			<c:out value="${p.ulice}"/>&amp;#160;
+			<c:out value="${p.cisloPopisne}"/><br/>
+			<c:out value="${p.mesto}"/>
+		    </p>
+		    <c:if test="${p.url != null}">
+			<p><a href="${fn:escapeXml(p.url)}"><fmt:message key="uvod.www"/></a></p>
+		    </c:if>
+		</div>
+
+		<!-- Hlasování a graf -->
+		<div class="hlasovani">
+		    <nk:hlasovani podnik="${p.id}"/>
+		</div>
+
+		<!-- Fotky podniku -->
+		<div class="fotky">
+		    <nk:fotkyPodniku podnik="${p}"/>
+		</div>
+
 	    </div>
+	</c:forEach>
 
-	    <!-- Hlasování a graf -->
-	    <div class="hlasovani">
-		<nk:hlasovani podnik="${p.id}"/>
-	    </div>
+	<!-- konec obtékaných bloků -->
+	<div class="cistic"></div>
 
-	    <!-- Fotky podniku -->
-	    <div class="fotky">
-		<nk:fotkyPodniku podnik="${p}"/>
-	    </div>
-
-	</div>
-    </c:forEach>
-
-    <!-- konec obtékaných bloků -->
-    <div class="cistic"></div>
+    </nk:stranka>
 
 </jsp:root>
diff -r 81c64c582a26 -r 34c7eb5f2fae java/nekurak.net-web/web/WEB-INF/tags/nekurak/stranka.tag
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/stranka.tag	Thu Mar 18 14:22:16 2010 +0100
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+	  xmlns:c="http://java.sun.com/jsp/jstl/core"
+	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
+	  xmlns:nkfn="/WEB-INF/nekurakFunkce"
+	  version="2.0">
+
+    <jsp:directive.attribute name="titulek" type="java.lang.String" required="false"/>
+    <jsp:directive.tag description="Obaluje všechny stránky – obsahuje XHTML záhlaví a zápatí"/>
+
+    <jsp:output doctype-system="http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd"
+		doctype-root-element="html"
+		omit-xml-declaration="false"/>
+
+    <html xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:svg="http://www.w3.org/2000/svg"
+	  xmlns:xlink="http://www.w3.org/1999/xlink">
+	<head>
+	    <c:choose>
+		<c:when test="${titulek == null}">
+		    <title><fmt:message key="nazev"/></title>
+		</c:when>
+		<c:otherwise>
+		    <title>${fn:escapeXml(titulek)} – <fmt:message key="nazev"/></title>
+		</c:otherwise>
+	    </c:choose>
+	    <link href="styl.css" type="text/css" rel="StyleSheet"/>
+	    <script type="text/javascript" src="js/jquery.js"></script>
+	    <script type="text/javascript" src="js/jquery.bxSlider.js"></script>
+	    <link rel="alternate" type="application/atom+xml" title="podniky" href="atom/" />
+	</head>
+	<body>
+	    <div class="body">
+
+		<div id="horniPruh">
+		    <h1><fmt:message key="nazev"/></h1>
+		</div>
+
+		<ul id="nabidka">
+		    <li><a href="?"><fmt:message key="uvod"/></a></li>
+
+		    <c:choose>
+			<c:when test="${prihlasenyUzivatel == null}">
+			    <li><a href="?akce=prihlaseni"><fmt:message key="prihlasitSe"/></a></li>
+			    <li><a href="?akce=registrovatUzivatele"><fmt:message key="registrovatSe"/></a></li>
+			</c:when>
+			<c:otherwise>
+			    <li><a href="?akce=pridatPodnik"><fmt:message key="pridatPodnik"/></a></li>
+			    <li id="prihlasenyUzivatel"><fmt:message key="prihlasenyUzivatel"/>: ${prihlasenyUzivatel}</li>
+			    <li><a href="?akce=prihlaseni&amp;amp;odhlasit=ano"><fmt:message key="odhlasitSe"/></a></li>
+			</c:otherwise>
+		    </c:choose>
+
+		</ul>
+
+		<nk:prepinaniJazyku/>
+
+		<div id="obsah">
+
+		    <!-- Vlastní obsah stránky -->
+		    <jsp:doBody/>
+
+		</div>
+
+		<div id="paticka">
+		    <p>
+			<fmt:message key="licence"/>&amp;#160;
+			<a href="nekurak.net-src.zip">nekurak.net-src.zip</a>
+			<a href="nekurak.net-src.zip.SHA-512">.</a>
+		    </p>
+		</div>
+
+	    </div>
+	</body>
+    </html>
+
+</jsp:root>
\ No newline at end of file
diff -r 81c64c582a26 -r 34c7eb5f2fae java/nekurak.net-web/web/index.jsp
--- a/java/nekurak.net-web/web/index.jsp	Tue Mar 16 14:33:05 2010 +0100
+++ b/java/nekurak.net-web/web/index.jsp	Thu Mar 18 14:22:16 2010 +0100
@@ -5,10 +5,7 @@
 	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
 	  version="2.0">
     <jsp:directive.page contentType="application/xhtml+xml"/>
-    <jsp:output doctype-system="http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd"
-		doctype-root-element="html"
-		omit-xml-declaration="false"/>
-
+    
     <!-- <lokalizace> -->
     <c:if test="${param.jazyk != null}">
 	<fmt:setLocale value="${param.jazyk}" scope="session"/>
@@ -29,75 +26,24 @@
     </c:if>
     <!-- </autentizace> -->
 
-
-    <html xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:svg="http://www.w3.org/2000/svg"
-	  xmlns:xlink="http://www.w3.org/1999/xlink">
-	<head>
-	    <title><fmt:message key="nazev"/></title>
-	    <link href="styl.css" type="text/css" rel="StyleSheet"/>
-	    <script type="text/javascript" src="js/jquery.js"></script>
-	    <script type="text/javascript" src="js/jquery.bxSlider.js"></script>
-	    <link rel="alternate" type="application/atom+xml" title="podniky" href="atom/" />
-	</head>
-	<body>
-	    <div class="body">
-
-		<div id="horniPruh">
-		    <h1><fmt:message key="nazev"/></h1>
-		</div>
-
-		<ul id="nabidka">
-		    <li><a href="?"><fmt:message key="uvod"/></a></li>
-
-		    <c:choose>
-			<c:when test="${prihlasenyUzivatel == null}">
-			    <li><a href="?akce=prihlaseni"><fmt:message key="prihlasitSe"/></a></li>
-			    <li><a href="?akce=registrovatUzivatele"><fmt:message key="registrovatSe"/></a></li>
-			</c:when>
-			<c:otherwise>
-			    <li><a href="?akce=pridatPodnik"><fmt:message key="pridatPodnik"/></a></li>
-			    <li id="prihlasenyUzivatel"><fmt:message key="prihlasenyUzivatel"/>: ${prihlasenyUzivatel}</li>
-			    <li><a href="?akce=prihlaseni&amp;amp;odhlasit=ano"><fmt:message key="odhlasitSe"/></a></li>
-			</c:otherwise>
-		    </c:choose>
-
-		</ul>
-
-		<nk:prepinaniJazyku/>
-
-		<div id="obsah">
-
-		    <c:choose>
-			<c:when test="${param.akce == 'detail'}">
-			    <jsp:include page="/WEB-INF/casti/detail.jsp" flush="false"/>
-			</c:when>
-			<c:when test="${param.akce == 'pridatPodnik'}">
-			    <jsp:include page="/WEB-INF/casti/pridatPodnik.jsp" flush="false"/>
-			</c:when>
-			<c:when test="${param.akce == 'registrovatUzivatele'}">
-			    <jsp:include page="/WEB-INF/casti/registrovatUzivatele.jsp" flush="false"/>
-			</c:when>
-			<c:when test="${param.akce == 'prihlaseni'}">
-			    <jsp:include page="/WEB-INF/casti/prihlaseni.jsp" flush="false"/>
-			</c:when>
-			<c:otherwise>
-			    <jsp:include page="/WEB-INF/casti/uvod.jsp" flush="false"/>
-			</c:otherwise>
-		    </c:choose>
-
-		</div>
-
-		<div id="paticka">
-		    <p>
-			<fmt:message key="licence"/>&amp;#160;
-			<a href="nekurak.net-src.zip">nekurak.net-src.zip</a>
-			<a href="nekurak.net-src.zip.SHA-512">.</a>
-		    </p>
-		</div>
-
-	    </div>
-	</body>
-    </html>
+    <!-- <výběrStránky> -->
+    <c:choose>
+	<c:when test="${param.akce == 'detail'}">
+	    <jsp:include page="/WEB-INF/casti/detail.jsp" flush="false"/>
+	</c:when>
+	<c:when test="${param.akce == 'pridatPodnik'}">
+	    <jsp:include page="/WEB-INF/casti/pridatPodnik.jsp" flush="false"/>
+	</c:when>
+	<c:when test="${param.akce == 'registrovatUzivatele'}">
+	    <jsp:include page="/WEB-INF/casti/registrovatUzivatele.jsp" flush="false"/>
+	</c:when>
+	<c:when test="${param.akce == 'prihlaseni'}">
+	    <jsp:include page="/WEB-INF/casti/prihlaseni.jsp" flush="false"/>
+	</c:when>
+	<c:otherwise>
+	    <jsp:include page="/WEB-INF/casti/uvod.jsp" flush="false"/>
+	</c:otherwise>
+    </c:choose>
+    <!-- </výběrStránky> -->
 
 </jsp:root>