# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1275945242 -7200
# Node ID d47f6a75d20e024faf843170a3143d55047f890f
# Parent  1eecc767a610f55167d18ed345fe1b7230509ed4
Komentáře: kostra, značka

diff -r 1eecc767a610 -r d47f6a75d20e java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Tue May 25 17:22:31 2010 +0200
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Mon Jun 07 23:14:02 2010 +0200
@@ -79,3 +79,11 @@
 hlasovani.graf.kourit=kou\u0159it
 hlasovani.graf.nekourit=nekou\u0159it
 hlasovani.TODO=TODO: lokalizovat Javascript
+
+komentare.vypisNadpis=Koment\u00E1\u0159e k tomuto podniku
+komentare.=
+komentare.=
+komentare.=
+komentare.=
+komentare.=
+komentare.=
\ No newline at end of file
diff -r 1eecc767a610 -r d47f6a75d20e java/nekurak.net-lib/test/cz/frantovo/nekurak/util/HashTest.java
--- a/java/nekurak.net-lib/test/cz/frantovo/nekurak/util/HashTest.java	Tue May 25 17:22:31 2010 +0200
+++ b/java/nekurak.net-lib/test/cz/frantovo/nekurak/util/HashTest.java	Mon Jun 07 23:14:02 2010 +0200
@@ -1,6 +1,5 @@
 package cz.frantovo.nekurak.util;
 
-import java.lang.NullPointerException;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
diff -r 1eecc767a610 -r d47f6a75d20e java/nekurak.net-web/web/WEB-INF/casti/detail.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/detail.jsp	Tue May 25 17:22:31 2010 +0200
+++ b/java/nekurak.net-web/web/WEB-INF/casti/detail.jsp	Mon Jun 07 23:14:02 2010 +0200
@@ -34,7 +34,7 @@
 	    </c:otherwise>
 	</c:choose>
 
-
+	<nk:komentareVypis podnik="${detail.podnik}"/>
 
     </nk:stranka>
 
diff -r 1eecc767a610 -r d47f6a75d20e java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag	Mon Jun 07 23:14:02 2010 +0200
@@ -0,0 +1,25 @@
+<?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:nkfn="/WEB-INF/nekurakFunkce"
+	  version="2.0">
+
+    <jsp:directive.attribute name="podnik" type="cz.frantovo.nekurak.dto.Podnik" required="true"/>
+
+    <div class="komentare">
+	<h3><fmt:message key="komentare.vypisNadpis"/></h3>
+	<c:choose>
+	    <c:when test="${prihlasenyUzivatel == null}">
+		<p>pro vkládání komentářů se prosím přihlašte</p>
+	    </c:when>
+	    <c:otherwise>
+		<p>Uživatel: <c:out value="${prihlasenyUzivatel}" /></p>
+	    </c:otherwise>
+	</c:choose>
+
+
+    </div>
+
+</jsp:root>
\ No newline at end of file
diff -r 1eecc767a610 -r d47f6a75d20e java/nekurak.net-web/web/styl.css
--- a/java/nekurak.net-web/web/styl.css	Tue May 25 17:22:31 2010 +0200
+++ b/java/nekurak.net-web/web/styl.css	Mon Jun 07 23:14:02 2010 +0200
@@ -208,3 +208,7 @@
     height: 32px;
     text-indent: 1000px;
 }
+
+.komentare {
+    border-top: 1px dashed silver;
+}