1.1 --- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties Tue Mar 16 14:33:05 2010 +0100
1.2 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties Thu Mar 18 14:22:16 2010 +0100
1.3 @@ -30,6 +30,7 @@
1.4
1.5 prihlaseni.odhlaseniUspesne=Odhl\u00E1\u0161en\u00ED prob\u011Bhlo \u00FAsp\u011B\u0161n\u011B.
1.6 prihlaseni.nadpis=P\u0159ihl\u00E1\u0161en\u00ED
1.7 +prihlaseni.nadpis.odhlaseni=Odhl\u00E1\u0161en\u00ED
1.8 prihlaseni.zadejte=Zadejte jm\u00E9no a heslo.
1.9 prihlaseni.chyba=Nespr\u00E1vn\u00E9 jm\u00E9no nebo heslo, zkuste to pros\u00EDm znovu.
1.10 prihlaseni.jmeno=Jm\u00E9no
2.1 --- a/java/nekurak.net-web/web/WEB-INF/casti/detail.jsp Tue Mar 16 14:33:05 2010 +0100
2.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/detail.jsp Thu Mar 18 14:22:16 2010 +0100
2.3 @@ -3,8 +3,11 @@
2.4 xmlns:c="http://java.sun.com/jsp/jstl/core"
2.5 xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
2.6 xmlns:fn="http://java.sun.com/jsp/jstl/functions"
2.7 + xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
2.8 version="2.0">
2.9
2.10 - <p>TODO: Detail podniku (<c:out value="${param.podnik}"/>).</p>
2.11 + <nk:stranka titulek="TODO: Detail podniku">
2.12 + <p>TODO: Detail podniku (<c:out value="${param.podnik}"/>).</p>
2.13 + </nk:stranka>
2.14
2.15 </jsp:root>
3.1 --- a/java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp Tue Mar 16 14:33:05 2010 +0100
3.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp Thu Mar 18 14:22:16 2010 +0100
3.3 @@ -3,47 +3,50 @@
3.4 xmlns:c="http://java.sun.com/jsp/jstl/core"
3.5 xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
3.6 xmlns:fn="http://java.sun.com/jsp/jstl/functions"
3.7 + xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
3.8 version="2.0">
3.9
3.10 <jsp:useBean id="podnik" class="cz.frantovo.nekurak.dto.Podnik" scope="request"/>
3.11 <jsp:useBean id="pridatPodnik" class="cz.frantovo.nekurak.web.PridatPodnik" scope="request"/>
3.12
3.13 - <h1><fmt:message key="pridatPodnik.nadpis"/></h1>
3.14 + <fmt:message key="pridatPodnik.nadpis" var="titulekStranky"/>
3.15 + <nk:stranka titulek="${titulekStranky}">
3.16
3.17 - <c:choose>
3.18 - <c:when test="${param.akcePridat == 'pridej'}">
3.19 - <c:catch var="pridatPodnikChyba">
3.20 - <jsp:setProperty name="podnik" property="*"/>
3.21 - <jsp:setProperty name="pridatPodnik" property="podnik" value="${podnik}"/>
3.22 - <c:set var="pridatPodnikOK" value="${pridatPodnik.pridano}"/>
3.23 - </c:catch>
3.24 - <c:choose>
3.25 - <c:when test="${pridatPodnikChyba == null}">
3.26 - <p><fmt:message key="pridatPodnik.bylPridan"/></p>
3.27 - </c:when>
3.28 - <c:otherwise>
3.29 - <p class="chybovaHlaska"><fmt:message key="pridatPodnik.nebylPridan"/></p>
3.30 - </c:otherwise>
3.31 - </c:choose>
3.32 - </c:when>
3.33 - <c:otherwise>
3.34 - <form method="post" action="?akce=pridatPodnik&amp;akcePridat=pridej">
3.35 - <fieldset>
3.36 - <label><fmt:message key="dto.podnik.nazev"/>: <input type="text" name="nazev" maxlength="255"/></label><br/>
3.37 - <label><fmt:message key="dto.podnik.popis"/>: <input type="text" name="popis" maxlength="255"/></label><br/>
3.38 - <fmt:message key="dto.podnik.url.tip" var="urlTip"/>
3.39 - <label title="${urlTip}"><fmt:message key="dto.podnik.url"/>: <input type="text" name="url" maxlength="255"/></label><br/>
3.40 - <label><fmt:message key="dto.podnik.ulice"/>: <input type="text" name="ulice" maxlength="64"/></label><br/>
3.41 - <fmt:message key="dto.podnik.cisloPopisne.tip" var="cisloPopisneTip"/>
3.42 - <label title="${cisloPopisneTip}"><fmt:message key="dto.podnik.cisloPopisne"/>: <input type="text" name="cisloPopisne" maxlength="5"/></label><br/>
3.43 - <label><fmt:message key="dto.podnik.mesto"/>: <input type="text" name="mesto" maxlength="64"/></label><br/>
3.44 - <button value="submit"><fmt:message key="pridatPodnik.tlacitko"/></button>
3.45 - </fieldset>
3.46 - </form>
3.47 - </c:otherwise>
3.48 - </c:choose>
3.49 + <h1><c:out value="${titulekStranky}"/></h1>
3.50
3.51 + <c:choose>
3.52 + <c:when test="${param.akcePridat == 'pridej'}">
3.53 + <c:catch var="pridatPodnikChyba">
3.54 + <jsp:setProperty name="podnik" property="*"/>
3.55 + <jsp:setProperty name="pridatPodnik" property="podnik" value="${podnik}"/>
3.56 + <c:set var="pridatPodnikOK" value="${pridatPodnik.pridano}"/>
3.57 + </c:catch>
3.58 + <c:choose>
3.59 + <c:when test="${pridatPodnikChyba == null}">
3.60 + <p><fmt:message key="pridatPodnik.bylPridan"/></p>
3.61 + </c:when>
3.62 + <c:otherwise>
3.63 + <p class="chybovaHlaska"><fmt:message key="pridatPodnik.nebylPridan"/></p>
3.64 + </c:otherwise>
3.65 + </c:choose>
3.66 + </c:when>
3.67 + <c:otherwise>
3.68 + <form method="post" action="?akce=pridatPodnik&amp;akcePridat=pridej">
3.69 + <fieldset>
3.70 + <label><fmt:message key="dto.podnik.nazev"/>: <input type="text" name="nazev" maxlength="255"/></label><br/>
3.71 + <label><fmt:message key="dto.podnik.popis"/>: <input type="text" name="popis" maxlength="255"/></label><br/>
3.72 + <fmt:message key="dto.podnik.url.tip" var="urlTip"/>
3.73 + <label title="${urlTip}"><fmt:message key="dto.podnik.url"/>: <input type="text" name="url" maxlength="255"/></label><br/>
3.74 + <label><fmt:message key="dto.podnik.ulice"/>: <input type="text" name="ulice" maxlength="64"/></label><br/>
3.75 + <fmt:message key="dto.podnik.cisloPopisne.tip" var="cisloPopisneTip"/>
3.76 + <label title="${cisloPopisneTip}"><fmt:message key="dto.podnik.cisloPopisne"/>: <input type="text" name="cisloPopisne" maxlength="5"/></label><br/>
3.77 + <label><fmt:message key="dto.podnik.mesto"/>: <input type="text" name="mesto" maxlength="64"/></label><br/>
3.78 + <button value="submit"><fmt:message key="pridatPodnik.tlacitko"/></button>
3.79 + </fieldset>
3.80 + </form>
3.81 + </c:otherwise>
3.82 + </c:choose>
3.83
3.84 -
3.85 + </nk:stranka>
3.86
3.87 </jsp:root>
4.1 --- a/java/nekurak.net-web/web/WEB-INF/casti/prihlaseni.jsp Tue Mar 16 14:33:05 2010 +0100
4.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/prihlaseni.jsp Thu Mar 18 14:22:16 2010 +0100
4.3 @@ -3,34 +3,36 @@
4.4 xmlns:c="http://java.sun.com/jsp/jstl/core"
4.5 xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
4.6 xmlns:fn="http://java.sun.com/jsp/jstl/functions"
4.7 + xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
4.8 version="2.0">
4.9
4.10 - <jsp:useBean id="podnik" class="cz.frantovo.nekurak.dto.Podnik" scope="request"/>
4.11 - <jsp:useBean id="pridatPodnik" class="cz.frantovo.nekurak.web.PridatPodnik" scope="request"/>
4.12 -
4.13 -
4.14 <c:choose>
4.15 <c:when test="${param.odhlasit == 'ano'}">
4.16 - <p><fmt:message key="prihlaseni.odhlaseniUspesne"/></p>
4.17 + <fmt:message key="prihlaseni.nadpis.odhlaseni" var="titulekStranky"/>
4.18 + <nk:stranka titulek="${titulekStranky}">
4.19 + <p><fmt:message key="prihlaseni.odhlaseniUspesne"/></p>
4.20 + </nk:stranka>
4.21 </c:when>
4.22 <c:otherwise>
4.23 - <h1><fmt:message key="prihlaseni.nadpis"/></h1>
4.24 - <p><fmt:message key="prihlaseni.zadejte"/></p>
4.25 + <fmt:message key="prihlaseni.nadpis" var="titulekStranky"/>
4.26 + <nk:stranka titulek="${titulekStranky}">
4.27 + <h1><c:out value="${titulekStranky}"/></h1>
4.28 + <p><fmt:message key="prihlaseni.zadejte"/></p>
4.29
4.30 - <c:if test="${param.chyba == 'ano'}">
4.31 - <p class="chybovaHlaska"><fmt:message key="prihlaseni.chyba"/></p>
4.32 - </c:if>
4.33 + <c:if test="${param.chyba == 'ano'}">
4.34 + <p class="chybovaHlaska"><fmt:message key="prihlaseni.chyba"/></p>
4.35 + </c:if>
4.36
4.37 - <form method="post" action="j_security_check">
4.38 - <fieldset>
4.39 - <label><fmt:message key="prihlaseni.jmeno"/>: <input type="text" name="j_username"/></label><br/>
4.40 - <label><fmt:message key="prihlaseni.heslo"/>: <input type="password" name="j_password"/></label><br/>
4.41 - <button value="submit"><fmt:message key="prihlaseni.tlacitko"/></button>
4.42 - </fieldset>
4.43 - </form>
4.44 + <form method="post" action="j_security_check">
4.45 + <fieldset>
4.46 + <label><fmt:message key="prihlaseni.jmeno"/>: <input type="text" name="j_username"/></label><br/>
4.47 + <label><fmt:message key="prihlaseni.heslo"/>: <input type="password" name="j_password"/></label><br/>
4.48 + <button value="submit"><fmt:message key="prihlaseni.tlacitko"/></button>
4.49 + </fieldset>
4.50 + </form>
4.51 + </nk:stranka>
4.52 </c:otherwise>
4.53 </c:choose>
4.54
4.55
4.56 -
4.57 </jsp:root>
5.1 --- a/java/nekurak.net-web/web/WEB-INF/casti/registrovatUzivatele.jsp Tue Mar 16 14:33:05 2010 +0100
5.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/registrovatUzivatele.jsp Thu Mar 18 14:22:16 2010 +0100
5.3 @@ -3,88 +3,94 @@
5.4 xmlns:c="http://java.sun.com/jsp/jstl/core"
5.5 xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
5.6 xmlns:fn="http://java.sun.com/jsp/jstl/functions"
5.7 + xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
5.8 version="2.0">
5.9
5.10 <jsp:useBean id="uzivatel" class="cz.frantovo.nekurak.dto.PozadavekNaRegistraciUzivatele" scope="request"/>
5.11 <jsp:useBean id="uzivatelPredRegistraci" class="cz.frantovo.nekurak.web.UzivatelPredRegistraci" scope="request"/>
5.12 <jsp:useBean id="registraceUzivatele" class="cz.frantovo.nekurak.web.RegistraceUzivatele" scope="session"/>
5.13
5.14 - <h1><fmt:message key="registrace.nadpis"/></h1>
5.15 + <fmt:message key="registrace.nadpis" var="titulekStranky"/>
5.16 + <nk:stranka titulek="${titulekStranky}">
5.17
5.18 - <!--
5.19 - Registrace probíhá ve třech krocích:
5.20 + <h1><c:out value="${titulekStranky}"/></h1>
5.21 +
5.22 + <!--
5.23 + Registrace probíhá ve třech krocích:
5.24 1) uživatel vyplňí formulář
5.25 2) zobrazíme mu vyplněné údaje a on si je zkontroluje
5.26 - 3) potvrdí registraci
5.27 - -->
5.28 + 3) potvrdí registraci
5.29 + -->
5.30
5.31 - <c:choose>
5.32 - <c:when test="${param.akceRegistrace == 'kontrola'}">
5.33 - <!-- Vypíšeme uživateli údaje, které zadal do formuláře, aby si je mohl zkontrolovat. -->
5.34 - <c:choose>
5.35 - <c:when test="${param.heslo == param.heslo_kontrola}">
5.36 - <jsp:setProperty name="uzivatel" property="*"/>
5.37 - <jsp:setProperty name="uzivatelPredRegistraci" property="uzivatel" value="${uzivatel}"/>
5.38 - <jsp:setProperty name="registraceUzivatele" property="uzivatel" value="${uzivatelPredRegistraci}"/>
5.39 + <c:choose>
5.40 + <c:when test="${param.akceRegistrace == 'kontrola'}">
5.41 + <!-- Vypíšeme uživateli údaje, které zadal do formuláře, aby si je mohl zkontrolovat. -->
5.42 + <c:choose>
5.43 + <c:when test="${param.heslo == param.heslo_kontrola}">
5.44 + <jsp:setProperty name="uzivatel" property="*"/>
5.45 + <jsp:setProperty name="uzivatelPredRegistraci" property="uzivatel" value="${uzivatel}"/>
5.46 + <jsp:setProperty name="registraceUzivatele" property="uzivatel" value="${uzivatelPredRegistraci}"/>
5.47
5.48 - <p><fmt:message key="registrace.kontrola"/></p>
5.49 + <p><fmt:message key="registrace.kontrola"/></p>
5.50
5.51 - <p class="registraceKontrolaUdaju">
5.52 - <fmt:message key="dto.uzivatel.prezdivka"/>: <c:out value="${uzivatel.prezdivka}"/><br/>
5.53 - <fmt:message key="dto.uzivatel.jmeno"/>: <c:out value="${uzivatel.jmeno}"/><br/>
5.54 - <fmt:message key="dto.uzivatel.prijmeni"/>: <c:out value="${uzivatel.prijmeni}"/><br/>
5.55 - <fmt:message key="dto.uzivatel.email"/>: <c:out value="${uzivatel.email}"/><br/>
5.56 - </p>
5.57 + <p class="registraceKontrolaUdaju">
5.58 + <fmt:message key="dto.uzivatel.prezdivka"/>: <c:out value="${uzivatel.prezdivka}"/><br/>
5.59 + <fmt:message key="dto.uzivatel.jmeno"/>: <c:out value="${uzivatel.jmeno}"/><br/>
5.60 + <fmt:message key="dto.uzivatel.prijmeni"/>: <c:out value="${uzivatel.prijmeni}"/><br/>
5.61 + <fmt:message key="dto.uzivatel.email"/>: <c:out value="${uzivatel.email}"/><br/>
5.62 + </p>
5.63
5.64 - <p>
5.65 - <a href="?akce=registrovatUzivatele&amp;akceRegistrace=dokonceni&amp;token=${fn:escapeXml(uzivatelPredRegistraci.token)}">
5.66 - <fmt:message key="registrace.potvrdit"/>
5.67 - </a>
5.68 - </p>
5.69 - </c:when>
5.70 - <c:otherwise>
5.71 - <p class="chybovaHlaska"><fmt:message key="registrace.vyjimka.heslaSeNeshoduji"/></p>
5.72 - </c:otherwise>
5.73 - </c:choose>
5.74 - </c:when>
5.75 - <c:when test="${param.akceRegistrace == 'dokonceni'}">
5.76 - <!-- Uživatel si zkontroloval údaje a chce dokončit svoji registraci. -->
5.77 - <jsp:setProperty name="registraceUzivatele" property="token" value="${param.token}"/>
5.78 + <p>
5.79 + <a href="?akce=registrovatUzivatele&amp;akceRegistrace=dokonceni&amp;token=${fn:escapeXml(uzivatelPredRegistraci.token)}">
5.80 + <fmt:message key="registrace.potvrdit"/>
5.81 + </a>
5.82 + </p>
5.83 + </c:when>
5.84 + <c:otherwise>
5.85 + <p class="chybovaHlaska"><fmt:message key="registrace.vyjimka.heslaSeNeshoduji"/></p>
5.86 + </c:otherwise>
5.87 + </c:choose>
5.88 + </c:when>
5.89 + <c:when test="${param.akceRegistrace == 'dokonceni'}">
5.90 + <!-- Uživatel si zkontroloval údaje a chce dokončit svoji registraci. -->
5.91 + <jsp:setProperty name="registraceUzivatele" property="token" value="${param.token}"/>
5.92
5.93 - <c:set var="chybaRegistrace" value="${registraceUzivatele.dokonciRegistraci}"/>
5.94 + <c:set var="chybaRegistrace" value="${registraceUzivatele.dokonciRegistraci}"/>
5.95
5.96 - <c:choose>
5.97 - <c:when test="${chybaRegistrace == null}">
5.98 - <!-- Registrace proběhla úspěšně. -->
5.99 - <p>
5.100 - <fmt:message key="registrace.hotovo"/>&#160;
5.101 - <a href="?akce=prihlaseni">
5.102 - <fmt:message key="registrace.hotovo.prihlasit"/>
5.103 - </a>.
5.104 - </p>
5.105 - </c:when>
5.106 - <c:otherwise>
5.107 - <!-- Během pokusu o registraci uživatele došlo k chybě. -->
5.108 - <p class="chybovaHlaska"><fmt:message key="${chybaRegistrace}"/></p>
5.109 - </c:otherwise>
5.110 - </c:choose>
5.111 - </c:when>
5.112 - <c:otherwise>
5.113 - <!-- Zobrazíme uživateli registrační formulář. -->
5.114 - <form method="post" action="?akce=registrovatUzivatele&amp;akceRegistrace=kontrola">
5.115 - <fieldset>
5.116 - <fmt:message key="dto.uzivatel.prezdivka.tip" var="prezdivkaTip"/>
5.117 - <label title="${prezdivkaTip}"><fmt:message key="dto.uzivatel.prezdivka"/>: <input type="text" name="prezdivka" maxlength="255"/></label><br/>
5.118 - <label><fmt:message key="dto.uzivatel.heslo"/>: <input type="password" name="heslo" maxlength="255"/></label><br/>
5.119 - <label><fmt:message key="dto.uzivatel.heslo.kontrola"/>: <input type="password" name="heslo_kontrola" maxlength="255"/></label><br/>
5.120 - <br/>
5.121 - <label><fmt:message key="dto.uzivatel.jmeno"/>: <input type="text" name="jmeno" maxlength="255"/></label><br/>
5.122 - <label><fmt:message key="dto.uzivatel.prijmeni"/>: <input type="text" name="prijmeni" maxlength="255"/></label><br/>
5.123 - <label><fmt:message key="dto.uzivatel.email"/>: <input type="text" name="email" maxlength="255"/></label><br/>
5.124 - <button value="submit"><fmt:message key="registrace.tlacitko"/></button>
5.125 - </fieldset>
5.126 - </form>
5.127 - </c:otherwise>
5.128 - </c:choose>
5.129 + <c:choose>
5.130 + <c:when test="${chybaRegistrace == null}">
5.131 + <!-- Registrace proběhla úspěšně. -->
5.132 + <p>
5.133 + <fmt:message key="registrace.hotovo"/>&#160;
5.134 + <a href="?akce=prihlaseni">
5.135 + <fmt:message key="registrace.hotovo.prihlasit"/>
5.136 + </a>.
5.137 + </p>
5.138 + </c:when>
5.139 + <c:otherwise>
5.140 + <!-- Během pokusu o registraci uživatele došlo k chybě. -->
5.141 + <p class="chybovaHlaska"><fmt:message key="${chybaRegistrace}"/></p>
5.142 + </c:otherwise>
5.143 + </c:choose>
5.144 + </c:when>
5.145 + <c:otherwise>
5.146 + <!-- Zobrazíme uživateli registrační formulář. -->
5.147 + <form method="post" action="?akce=registrovatUzivatele&amp;akceRegistrace=kontrola">
5.148 + <fieldset>
5.149 + <fmt:message key="dto.uzivatel.prezdivka.tip" var="prezdivkaTip"/>
5.150 + <label title="${prezdivkaTip}"><fmt:message key="dto.uzivatel.prezdivka"/>: <input type="text" name="prezdivka" maxlength="255"/></label><br/>
5.151 + <label><fmt:message key="dto.uzivatel.heslo"/>: <input type="password" name="heslo" maxlength="255"/></label><br/>
5.152 + <label><fmt:message key="dto.uzivatel.heslo.kontrola"/>: <input type="password" name="heslo_kontrola" maxlength="255"/></label><br/>
5.153 + <br/>
5.154 + <label><fmt:message key="dto.uzivatel.jmeno"/>: <input type="text" name="jmeno" maxlength="255"/></label><br/>
5.155 + <label><fmt:message key="dto.uzivatel.prijmeni"/>: <input type="text" name="prijmeni" maxlength="255"/></label><br/>
5.156 + <label><fmt:message key="dto.uzivatel.email"/>: <input type="text" name="email" maxlength="255"/></label><br/>
5.157 + <button value="submit"><fmt:message key="registrace.tlacitko"/></button>
5.158 + </fieldset>
5.159 + </form>
5.160 + </c:otherwise>
5.161 + </c:choose>
5.162 +
5.163 + </nk:stranka>
5.164
5.165 </jsp:root>
6.1 --- a/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp Tue Mar 16 14:33:05 2010 +0100
6.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp Thu Mar 18 14:22:16 2010 +0100
6.3 @@ -8,43 +8,47 @@
6.4
6.5 <jsp:useBean id="uvod" class="cz.frantovo.nekurak.web.Uvod" scope="request"/>
6.6
6.7 - <p><fmt:message key="uvod.naposledyPridanePodniky"/>:</p>
6.8 + <nk:stranka>
6.9
6.10 - <script type="text/javascript" src="js/fotkyPodniku.js"></script>
6.11 + <p><fmt:message key="uvod.naposledyPridanePodniky"/>:</p>
6.12
6.13 - <c:forEach var="p" items="${uvod.podniky}">
6.14 - <div class="podnik">
6.15 - <!-- Tři bloky vedle sebe -->
6.16 + <script type="text/javascript" src="js/fotkyPodniku.js"></script>
6.17
6.18 - <!-- Název a adresa podniku -->
6.19 - <div class="adresa">
6.20 - <h2><a href="?akce=detail&amp;podnik=${p.id}"><c:out value="${p.nazev}"/></a></h2>
6.21 - <p><c:out value="${p.popis}"/></p>
6.22 - <p>
6.23 - <fmt:message key="uvod.adresa"/>:<br/>
6.24 - <c:out value="${p.ulice}"/>&#160;
6.25 - <c:out value="${p.cisloPopisne}"/><br/>
6.26 - <c:out value="${p.mesto}"/>
6.27 - </p>
6.28 - <c:if test="${p.url != null}">
6.29 - <p><a href="${fn:escapeXml(p.url)}"><fmt:message key="uvod.www"/></a></p>
6.30 - </c:if>
6.31 + <c:forEach var="p" items="${uvod.podniky}">
6.32 + <div class="podnik">
6.33 + <!-- Tři bloky vedle sebe -->
6.34 +
6.35 + <!-- Název a adresa podniku -->
6.36 + <div class="adresa">
6.37 + <h2><a href="?akce=detail&amp;podnik=${p.id}"><c:out value="${p.nazev}"/></a></h2>
6.38 + <p><c:out value="${p.popis}"/></p>
6.39 + <p>
6.40 + <fmt:message key="uvod.adresa"/>:<br/>
6.41 + <c:out value="${p.ulice}"/>&#160;
6.42 + <c:out value="${p.cisloPopisne}"/><br/>
6.43 + <c:out value="${p.mesto}"/>
6.44 + </p>
6.45 + <c:if test="${p.url != null}">
6.46 + <p><a href="${fn:escapeXml(p.url)}"><fmt:message key="uvod.www"/></a></p>
6.47 + </c:if>
6.48 + </div>
6.49 +
6.50 + <!-- Hlasování a graf -->
6.51 + <div class="hlasovani">
6.52 + <nk:hlasovani podnik="${p.id}"/>
6.53 + </div>
6.54 +
6.55 + <!-- Fotky podniku -->
6.56 + <div class="fotky">
6.57 + <nk:fotkyPodniku podnik="${p}"/>
6.58 + </div>
6.59 +
6.60 </div>
6.61 + </c:forEach>
6.62
6.63 - <!-- Hlasování a graf -->
6.64 - <div class="hlasovani">
6.65 - <nk:hlasovani podnik="${p.id}"/>
6.66 - </div>
6.67 + <!-- konec obtékaných bloků -->
6.68 + <div class="cistic"></div>
6.69
6.70 - <!-- Fotky podniku -->
6.71 - <div class="fotky">
6.72 - <nk:fotkyPodniku podnik="${p}"/>
6.73 - </div>
6.74 -
6.75 - </div>
6.76 - </c:forEach>
6.77 -
6.78 - <!-- konec obtékaných bloků -->
6.79 - <div class="cistic"></div>
6.80 + </nk:stranka>
6.81
6.82 </jsp:root>
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/stranka.tag Thu Mar 18 14:22:16 2010 +0100
7.3 @@ -0,0 +1,79 @@
7.4 +<?xml version="1.0" encoding="UTF-8"?>
7.5 +<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
7.6 + xmlns:c="http://java.sun.com/jsp/jstl/core"
7.7 + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
7.8 + xmlns:fn="http://java.sun.com/jsp/jstl/functions"
7.9 + xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
7.10 + xmlns:nkfn="/WEB-INF/nekurakFunkce"
7.11 + version="2.0">
7.12 +
7.13 + <jsp:directive.attribute name="titulek" type="java.lang.String" required="false"/>
7.14 + <jsp:directive.tag description="Obaluje všechny stránky – obsahuje XHTML záhlaví a zápatí"/>
7.15 +
7.16 + <jsp:output doctype-system="http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd"
7.17 + doctype-root-element="html"
7.18 + omit-xml-declaration="false"/>
7.19 +
7.20 + <html xmlns="http://www.w3.org/1999/xhtml"
7.21 + xmlns:svg="http://www.w3.org/2000/svg"
7.22 + xmlns:xlink="http://www.w3.org/1999/xlink">
7.23 + <head>
7.24 + <c:choose>
7.25 + <c:when test="${titulek == null}">
7.26 + <title><fmt:message key="nazev"/></title>
7.27 + </c:when>
7.28 + <c:otherwise>
7.29 + <title>${fn:escapeXml(titulek)} – <fmt:message key="nazev"/></title>
7.30 + </c:otherwise>
7.31 + </c:choose>
7.32 + <link href="styl.css" type="text/css" rel="StyleSheet"/>
7.33 + <script type="text/javascript" src="js/jquery.js"></script>
7.34 + <script type="text/javascript" src="js/jquery.bxSlider.js"></script>
7.35 + <link rel="alternate" type="application/atom+xml" title="podniky" href="atom/" />
7.36 + </head>
7.37 + <body>
7.38 + <div class="body">
7.39 +
7.40 + <div id="horniPruh">
7.41 + <h1><fmt:message key="nazev"/></h1>
7.42 + </div>
7.43 +
7.44 + <ul id="nabidka">
7.45 + <li><a href="?"><fmt:message key="uvod"/></a></li>
7.46 +
7.47 + <c:choose>
7.48 + <c:when test="${prihlasenyUzivatel == null}">
7.49 + <li><a href="?akce=prihlaseni"><fmt:message key="prihlasitSe"/></a></li>
7.50 + <li><a href="?akce=registrovatUzivatele"><fmt:message key="registrovatSe"/></a></li>
7.51 + </c:when>
7.52 + <c:otherwise>
7.53 + <li><a href="?akce=pridatPodnik"><fmt:message key="pridatPodnik"/></a></li>
7.54 + <li id="prihlasenyUzivatel"><fmt:message key="prihlasenyUzivatel"/>: ${prihlasenyUzivatel}</li>
7.55 + <li><a href="?akce=prihlaseni&amp;odhlasit=ano"><fmt:message key="odhlasitSe"/></a></li>
7.56 + </c:otherwise>
7.57 + </c:choose>
7.58 +
7.59 + </ul>
7.60 +
7.61 + <nk:prepinaniJazyku/>
7.62 +
7.63 + <div id="obsah">
7.64 +
7.65 + <!-- Vlastní obsah stránky -->
7.66 + <jsp:doBody/>
7.67 +
7.68 + </div>
7.69 +
7.70 + <div id="paticka">
7.71 + <p>
7.72 + <fmt:message key="licence"/>&#160;
7.73 + <a href="nekurak.net-src.zip">nekurak.net-src.zip</a>
7.74 + <a href="nekurak.net-src.zip.SHA-512">.</a>
7.75 + </p>
7.76 + </div>
7.77 +
7.78 + </div>
7.79 + </body>
7.80 + </html>
7.81 +
7.82 +</jsp:root>
7.83 \ No newline at end of file
8.1 --- a/java/nekurak.net-web/web/index.jsp Tue Mar 16 14:33:05 2010 +0100
8.2 +++ b/java/nekurak.net-web/web/index.jsp Thu Mar 18 14:22:16 2010 +0100
8.3 @@ -5,10 +5,7 @@
8.4 xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
8.5 version="2.0">
8.6 <jsp:directive.page contentType="application/xhtml+xml"/>
8.7 - <jsp:output doctype-system="http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd"
8.8 - doctype-root-element="html"
8.9 - omit-xml-declaration="false"/>
8.10 -
8.11 +
8.12 <!-- <lokalizace> -->
8.13 <c:if test="${param.jazyk != null}">
8.14 <fmt:setLocale value="${param.jazyk}" scope="session"/>
8.15 @@ -29,75 +26,24 @@
8.16 </c:if>
8.17 <!-- </autentizace> -->
8.18
8.19 -
8.20 - <html xmlns="http://www.w3.org/1999/xhtml"
8.21 - xmlns:svg="http://www.w3.org/2000/svg"
8.22 - xmlns:xlink="http://www.w3.org/1999/xlink">
8.23 - <head>
8.24 - <title><fmt:message key="nazev"/></title>
8.25 - <link href="styl.css" type="text/css" rel="StyleSheet"/>
8.26 - <script type="text/javascript" src="js/jquery.js"></script>
8.27 - <script type="text/javascript" src="js/jquery.bxSlider.js"></script>
8.28 - <link rel="alternate" type="application/atom+xml" title="podniky" href="atom/" />
8.29 - </head>
8.30 - <body>
8.31 - <div class="body">
8.32 -
8.33 - <div id="horniPruh">
8.34 - <h1><fmt:message key="nazev"/></h1>
8.35 - </div>
8.36 -
8.37 - <ul id="nabidka">
8.38 - <li><a href="?"><fmt:message key="uvod"/></a></li>
8.39 -
8.40 - <c:choose>
8.41 - <c:when test="${prihlasenyUzivatel == null}">
8.42 - <li><a href="?akce=prihlaseni"><fmt:message key="prihlasitSe"/></a></li>
8.43 - <li><a href="?akce=registrovatUzivatele"><fmt:message key="registrovatSe"/></a></li>
8.44 - </c:when>
8.45 - <c:otherwise>
8.46 - <li><a href="?akce=pridatPodnik"><fmt:message key="pridatPodnik"/></a></li>
8.47 - <li id="prihlasenyUzivatel"><fmt:message key="prihlasenyUzivatel"/>: ${prihlasenyUzivatel}</li>
8.48 - <li><a href="?akce=prihlaseni&amp;odhlasit=ano"><fmt:message key="odhlasitSe"/></a></li>
8.49 - </c:otherwise>
8.50 - </c:choose>
8.51 -
8.52 - </ul>
8.53 -
8.54 - <nk:prepinaniJazyku/>
8.55 -
8.56 - <div id="obsah">
8.57 -
8.58 - <c:choose>
8.59 - <c:when test="${param.akce == 'detail'}">
8.60 - <jsp:include page="/WEB-INF/casti/detail.jsp" flush="false"/>
8.61 - </c:when>
8.62 - <c:when test="${param.akce == 'pridatPodnik'}">
8.63 - <jsp:include page="/WEB-INF/casti/pridatPodnik.jsp" flush="false"/>
8.64 - </c:when>
8.65 - <c:when test="${param.akce == 'registrovatUzivatele'}">
8.66 - <jsp:include page="/WEB-INF/casti/registrovatUzivatele.jsp" flush="false"/>
8.67 - </c:when>
8.68 - <c:when test="${param.akce == 'prihlaseni'}">
8.69 - <jsp:include page="/WEB-INF/casti/prihlaseni.jsp" flush="false"/>
8.70 - </c:when>
8.71 - <c:otherwise>
8.72 - <jsp:include page="/WEB-INF/casti/uvod.jsp" flush="false"/>
8.73 - </c:otherwise>
8.74 - </c:choose>
8.75 -
8.76 - </div>
8.77 -
8.78 - <div id="paticka">
8.79 - <p>
8.80 - <fmt:message key="licence"/>&#160;
8.81 - <a href="nekurak.net-src.zip">nekurak.net-src.zip</a>
8.82 - <a href="nekurak.net-src.zip.SHA-512">.</a>
8.83 - </p>
8.84 - </div>
8.85 -
8.86 - </div>
8.87 - </body>
8.88 - </html>
8.89 + <!-- <výběrStránky> -->
8.90 + <c:choose>
8.91 + <c:when test="${param.akce == 'detail'}">
8.92 + <jsp:include page="/WEB-INF/casti/detail.jsp" flush="false"/>
8.93 + </c:when>
8.94 + <c:when test="${param.akce == 'pridatPodnik'}">
8.95 + <jsp:include page="/WEB-INF/casti/pridatPodnik.jsp" flush="false"/>
8.96 + </c:when>
8.97 + <c:when test="${param.akce == 'registrovatUzivatele'}">
8.98 + <jsp:include page="/WEB-INF/casti/registrovatUzivatele.jsp" flush="false"/>
8.99 + </c:when>
8.100 + <c:when test="${param.akce == 'prihlaseni'}">
8.101 + <jsp:include page="/WEB-INF/casti/prihlaseni.jsp" flush="false"/>
8.102 + </c:when>
8.103 + <c:otherwise>
8.104 + <jsp:include page="/WEB-INF/casti/uvod.jsp" flush="false"/>
8.105 + </c:otherwise>
8.106 + </c:choose>
8.107 + <!-- </výběrStránky> -->
8.108
8.109 </jsp:root>