# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1268162790 -3600
# Node ID e019dbc42723f342661faa1d8157792330d2b716
# Parent  7162ed62c9ab470447591a58e2743ea2121ef1df
Přidán rámeček s fotkami (bxSlider) + vlastní značky (tagfile).

diff -r 7162ed62c9ab -r e019dbc42723 .hgignore
--- a/.hgignore	Sun Mar 07 21:19:35 2010 +0100
+++ b/.hgignore	Tue Mar 09 20:26:30 2010 +0100
@@ -18,3 +18,4 @@
 java/nekurak.net-lib/build/*
 java/nekurak.net-lib/nbproject/private
 
+java/nekurak.net-web/lib/*
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp	Sun Mar 07 21:19:35 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp	Tue Mar 09 20:26:30 2010 +0100
@@ -3,26 +3,48 @@
 	  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="uvod" class="cz.frantovo.nekurak.web.Uvod" scope="request"/>
 
     <p><fmt:message key="uvod.naposledyPridanePodniky"/>:</p>
 
+    <script type="text/javascript" src="js/fotkyPodniku.js"></script>
+
     <c:forEach var="p" items="${uvod.podniky}">
 	<div class="podnik">
-	    <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>
+	    <!-- 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.id}"/>
+	    </div>
+
 	</div>
     </c:forEach>
 
+    <!-- konec obtékaných bloků -->
+    <div class="cistic"></div>
+
 </jsp:root>
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/WEB-INF/tags/nekurak/fotkyPodniku.tag
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/fotkyPodniku.tag	Tue Mar 09 20:26:30 2010 +0100
@@ -0,0 +1,21 @@
+<?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"
+	  version="2.0">
+
+    <jsp:directive.attribute name="podnik" type="java.lang.Integer" required="true" description="ID podniku"/>
+
+    <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>
+	<p><img src="grafika/fotkaPodnikuZadne.png" alt="žádné další fotografie"/></p>
+    </div>
+
+    <script type="text/javascript">
+	fotkyPodniku.aktivuj(${podnik});
+    </script>
+
+</jsp:root>
\ No newline at end of file
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/WEB-INF/tags/nekurak/hlasovani.tag
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/hlasovani.tag	Tue Mar 09 20:26:30 2010 +0100
@@ -0,0 +1,12 @@
+<?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"
+	  version="2.0">
+
+    <jsp:directive.attribute name="podnik" type="java.lang.Integer" required="true" description="ID podniku"/>
+
+    <p>TODO: tady bude graf a hlasování.</p>
+
+</jsp:root>
\ No newline at end of file
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/grafika/fotkaPodnikuVzorova.png
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/grafika/fotkaPodnikuVzorova.png	Tue Mar 09 20:26:30 2010 +0100
@@ -0,0 +1,1 @@
+../../lib/grafika/fotkaPodnikuVzorova.png
\ No newline at end of file
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/grafika/fotkaPodnikuZadne.png
Binary file java/nekurak.net-web/web/grafika/fotkaPodnikuZadne.png has changed
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/grafika/fotkyPodnikuDalsi.png
Binary file java/nekurak.net-web/web/grafika/fotkyPodnikuDalsi.png has changed
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/grafika/fotkyPodnikuPredchozi.png
Binary file java/nekurak.net-web/web/grafika/fotkyPodnikuPredchozi.png has changed
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/index.jsp
--- a/java/nekurak.net-web/web/index.jsp	Sun Mar 07 21:19:35 2010 +0100
+++ b/java/nekurak.net-web/web/index.jsp	Tue Mar 09 20:26:30 2010 +0100
@@ -35,6 +35,8 @@
 	<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>
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/js/fotkyPodniku.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/js/fotkyPodniku.js	Tue Mar 09 20:26:30 2010 +0100
@@ -0,0 +1,12 @@
+var fotkyPodniku = {};
+
+fotkyPodniku.aktivuj = function (id) {
+    $("#fotkyPodniku" + id).bxSlider({
+	mode: "slide",
+	speed: 250,
+	controls: true,
+	next_text: "→",
+	prev_text: "←",
+	wrapper_class: "fotkyPodniku"
+    });
+};
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/js/jquery.bxSlider.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/js/jquery.bxSlider.js	Tue Mar 09 20:26:30 2010 +0100
@@ -0,0 +1,1 @@
+../../lib/js/jquery.bxSlider.js
\ No newline at end of file
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/js/jquery.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/js/jquery.js	Tue Mar 09 20:26:30 2010 +0100
@@ -0,0 +1,1 @@
+../../lib/js/jquery-1.4.2.min.js
\ No newline at end of file
diff -r 7162ed62c9ab -r e019dbc42723 java/nekurak.net-web/web/styl.css
--- a/java/nekurak.net-web/web/styl.css	Sun Mar 07 21:19:35 2010 +0100
+++ b/java/nekurak.net-web/web/styl.css	Tue Mar 09 20:26:30 2010 +0100
@@ -145,3 +145,41 @@
 .registraceKontrolaUdaju {
     color: gray;
 }
+
+.podnik .adresa {
+    float: left;
+    width: 500px;
+}
+.podnik .hlasovani {
+    float: left;
+    width: 280px;
+    height: 280px;
+}
+
+.podnik .fotky {
+    float: left;
+    width: 200px;
+    height: 280px;
+}
+
+.podnik {
+    clear: both;
+}
+
+.cistic {
+    clear: both;
+}
+
+.slider_prev  {
+    background-image: url('grafika/fotkyPodnikuPredchozi.png');
+    width: 32px;
+    height: 32px;
+    text-indent: 1000px;
+}
+
+.slider_next {
+    background-image: url('grafika/fotkyPodnikuDalsi.png');
+    width: 32px;
+    height: 32px;
+    text-indent: 1000px;
+}