# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1268527060 -3600
# Node ID df5aedafb826166b0a12b9b57ea32f8756cbd18e
# Parent  fa7e30dee3b3dd32bb544400133c8b46d9f9314a
Fotky se zobrazují ty, které jsou v databázi
(jen záznamy – soubory s fotkami jsou na disku).

diff -r fa7e30dee3b3 -r df5aedafb826 java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/FunkceEL.java
--- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/FunkceEL.java	Sun Mar 14 01:05:35 2010 +0100
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/FunkceEL.java	Sun Mar 14 01:37:40 2010 +0100
@@ -1,5 +1,6 @@
 package cz.frantovo.nekurak.web;
 
+import cz.frantovo.nekurak.dto.Podnik;
 import cz.frantovo.nekurak.servlet.Fotky;
 
 /**
@@ -15,4 +16,8 @@
 	String prostredek = nahled ? Fotky.PODADRESAR_NAHLED : Fotky.PODADRESAR_ORIGINAL;
 	return SERVLET + "/" + prostredek + "/" + id + "." + Fotky.PRIPONA;
     }
+
+    public static boolean maFotky(Podnik p) {
+	return !p.getFotky().isEmpty();
+    }
 }
diff -r fa7e30dee3b3 -r df5aedafb826 java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp	Sun Mar 14 01:05:35 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp	Sun Mar 14 01:37:40 2010 +0100
@@ -4,7 +4,6 @@
 	  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:useBean id="uvod" class="cz.frantovo.nekurak.web.Uvod" scope="request"/>
@@ -35,16 +34,11 @@
 	    <!-- Hlasování a graf -->
 	    <div class="hlasovani">
 		<nk:hlasovani podnik="${p.id}"/>
-
-		<c:forEach var="fotka" items="${p.fotky}">
-		    <p>${fotka.id} | ${fotka.popis}</p>
-		</c:forEach>
-
 	    </div>
 
 	    <!-- Fotky podniku -->
 	    <div class="fotky">
-		<nk:fotkyPodniku podnik="${p.id}"/>
+		<nk:fotkyPodniku podnik="${p}"/>
 	    </div>
 
 	</div>
diff -r fa7e30dee3b3 -r df5aedafb826 java/nekurak.net-web/web/WEB-INF/nekurakFunkce.tld
--- a/java/nekurak.net-web/web/WEB-INF/nekurakFunkce.tld	Sun Mar 14 01:05:35 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/nekurakFunkce.tld	Sun Mar 14 01:37:40 2010 +0100
@@ -10,5 +10,11 @@
 	<function-class>cz.frantovo.nekurak.web.FunkceEL</function-class>
 	<function-signature>java.lang.String fotka(int, boolean)</function-signature>
     </function>
+    <function>
+	<name>maFotky</name>
+	<description>Zda podnik má přiřazené nějaké fotky</description>
+	<function-class>cz.frantovo.nekurak.web.FunkceEL</function-class>
+	<function-signature>boolean maFotky(cz.frantovo.nekurak.dto.Podnik)</function-signature>
+    </function>
     
 </taglib>
diff -r fa7e30dee3b3 -r df5aedafb826 java/nekurak.net-web/web/WEB-INF/tags/nekurak/fotkyPodniku.tag
--- a/java/nekurak.net-web/web/WEB-INF/tags/nekurak/fotkyPodniku.tag	Sun Mar 14 01:05:35 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/fotkyPodniku.tag	Sun Mar 14 01:37:40 2010 +0100
@@ -3,19 +3,25 @@
 	  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="java.lang.Integer" required="true" description="ID podniku"/>
+    <jsp:directive.attribute name="podnik" type="cz.frantovo.nekurak.dto.Podnik" required="true"/>
 
-    <div id="fotkyPodniku${podnik}">
-	<p><img src="grafika/fotkaPodnikuVzorova.png" alt="demo"/></p>
-	<p><img src="grafika/fotkaPodnikuVzorova.png" alt="demo"/></p>
-	<p><img src="grafika/fotkaPodnikuVzorova.png" alt="demo"/></p>
+    <div id="fotkyPodniku${podnik.id}">
+	<c:forEach var="fotka" items="${podnik.fotky}">
+	    <p>
+		<a href="${nkfn:fotka(fotka.id, false)}">
+		    <img src="${nkfn:fotka(fotka.id, true)}" alt="fotka" title="${fn:escapeXml(fotka.popis)}"/>
+		</a>
+	    </p>
+	</c:forEach>
 	<p><img src="grafika/fotkaPodnikuZadne.png" alt="žádné další fotografie"/></p>
     </div>
 
-    <script type="text/javascript">
-	fotkyPodniku.aktivuj(${podnik});
-    </script>
-
+    <c:if test="${nkfn:maFotky(podnik)}">
+	<script type="text/javascript">
+	fotkyPodniku.aktivuj(${podnik.id});
+	</script>
+    </c:if>
 </jsp:root>
\ No newline at end of file
diff -r fa7e30dee3b3 -r df5aedafb826 java/nekurak.net-web/web/styl.css
--- a/java/nekurak.net-web/web/styl.css	Sun Mar 14 01:05:35 2010 +0100
+++ b/java/nekurak.net-web/web/styl.css	Sun Mar 14 01:37:40 2010 +0100
@@ -162,6 +162,10 @@
     height: 280px;
 }
 
+.podnik .fotky img {
+    border: none;
+}
+
 .podnik {
     clear: both;
 }