Komentáře: kostra, značka
authorFrantišek Kučera <franta-hg@frantovo.cz>
Mon, 07 Jun 2010 23:14:02 +0200
changeset 126d47f6a75d20e
parent 125 1eecc767a610
child 127 2b6107e510d8
Komentáře: kostra, značka
java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties
java/nekurak.net-lib/test/cz/frantovo/nekurak/util/HashTest.java
java/nekurak.net-web/web/WEB-INF/casti/detail.jsp
java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag
java/nekurak.net-web/web/styl.css
     1.1 --- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Tue May 25 17:22:31 2010 +0200
     1.2 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Mon Jun 07 23:14:02 2010 +0200
     1.3 @@ -79,3 +79,11 @@
     1.4  hlasovani.graf.kourit=kou\u0159it
     1.5  hlasovani.graf.nekourit=nekou\u0159it
     1.6  hlasovani.TODO=TODO: lokalizovat Javascript
     1.7 +
     1.8 +komentare.vypisNadpis=Koment\u00E1\u0159e k tomuto podniku
     1.9 +komentare.=
    1.10 +komentare.=
    1.11 +komentare.=
    1.12 +komentare.=
    1.13 +komentare.=
    1.14 +komentare.=
    1.15 \ No newline at end of file
     2.1 --- a/java/nekurak.net-lib/test/cz/frantovo/nekurak/util/HashTest.java	Tue May 25 17:22:31 2010 +0200
     2.2 +++ b/java/nekurak.net-lib/test/cz/frantovo/nekurak/util/HashTest.java	Mon Jun 07 23:14:02 2010 +0200
     2.3 @@ -1,6 +1,5 @@
     2.4  package cz.frantovo.nekurak.util;
     2.5  
     2.6 -import java.lang.NullPointerException;
     2.7  import org.junit.Test;
     2.8  import static org.junit.Assert.*;
     2.9  
     3.1 --- a/java/nekurak.net-web/web/WEB-INF/casti/detail.jsp	Tue May 25 17:22:31 2010 +0200
     3.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/detail.jsp	Mon Jun 07 23:14:02 2010 +0200
     3.3 @@ -34,7 +34,7 @@
     3.4  	    </c:otherwise>
     3.5  	</c:choose>
     3.6  
     3.7 -
     3.8 +	<nk:komentareVypis podnik="${detail.podnik}"/>
     3.9  
    3.10      </nk:stranka>
    3.11  
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag	Mon Jun 07 23:14:02 2010 +0200
     4.3 @@ -0,0 +1,25 @@
     4.4 +<?xml version="1.0" encoding="UTF-8"?>
     4.5 +<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
     4.6 +	  xmlns:c="http://java.sun.com/jsp/jstl/core"
     4.7 +	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
     4.8 +	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
     4.9 +	  xmlns:nkfn="/WEB-INF/nekurakFunkce"
    4.10 +	  version="2.0">
    4.11 +
    4.12 +    <jsp:directive.attribute name="podnik" type="cz.frantovo.nekurak.dto.Podnik" required="true"/>
    4.13 +
    4.14 +    <div class="komentare">
    4.15 +	<h3><fmt:message key="komentare.vypisNadpis"/></h3>
    4.16 +	<c:choose>
    4.17 +	    <c:when test="${prihlasenyUzivatel == null}">
    4.18 +		<p>pro vkládání komentářů se prosím přihlašte</p>
    4.19 +	    </c:when>
    4.20 +	    <c:otherwise>
    4.21 +		<p>Uživatel: <c:out value="${prihlasenyUzivatel}" /></p>
    4.22 +	    </c:otherwise>
    4.23 +	</c:choose>
    4.24 +
    4.25 +
    4.26 +    </div>
    4.27 +
    4.28 +</jsp:root>
    4.29 \ No newline at end of file
     5.1 --- a/java/nekurak.net-web/web/styl.css	Tue May 25 17:22:31 2010 +0200
     5.2 +++ b/java/nekurak.net-web/web/styl.css	Mon Jun 07 23:14:02 2010 +0200
     5.3 @@ -208,3 +208,7 @@
     5.4      height: 32px;
     5.5      text-indent: 1000px;
     5.6  }
     5.7 +
     5.8 +.komentare {
     5.9 +    border-top: 1px dashed silver;
    5.10 +}