# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1235924213 -3600
# Node ID d41dc2f3380dd6501ed9b0f07e2435a24f8cd305
# Parent  fd29fd5a8e29ae89cdb3f586206fd3948d056c15
JSP více modulární – rozdělení na více souborů

diff -r fd29fd5a8e29 -r d41dc2f3380d java/HrisniciSpameri/web/filtr.jspx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/HrisniciSpameri/web/filtr.jspx	Sun Mar 01 17:16:53 2009 +0100
@@ -0,0 +1,28 @@
+<?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:f="http://java.sun.com/jsp/jstl/functions"
+          version="2.0">
+
+    <form action="#" method="get">
+        <fieldset>
+            <label>Začátek: <input name="zacatek" type="text" value="${denniSouhrn.zacatek}"/></label><br/>
+            <label title="Pokud konec nezadáte, zobrazí se souhrn za jeden den – začátek">Konec: <input name="konec" type="text" value="${denniSouhrn.konec}"/></label><br/>
+            <label>Cíl: <select name="cil">
+                    <option value="0">Všechny cíle</option>
+                    <c:forEach var="c" items="${denniSouhrn.seznamCilu}">
+                        <c:choose>
+                            <c:when test="${c.id == denniSouhrn.cil}">
+                                <option value="${c.id}" selected="selected"><c:out value="${c.nazev}"/></option>
+                            </c:when>
+                            <c:otherwise>
+                                <option value="${c.id}"><c:out value="${c.nazev}"/></option>
+                            </c:otherwise>
+                        </c:choose>
+                    </c:forEach>
+            </select></label><br/>
+            <input name="graf" type="hidden" value="${param.graf}"/>
+            <button>Zobrazit</button>
+        </fieldset>
+    </form>
+</jsp:root>
\ No newline at end of file
diff -r fd29fd5a8e29 -r d41dc2f3380d java/HrisniciSpameri/web/graf.jspx
--- a/java/HrisniciSpameri/web/graf.jspx	Sun Mar 01 13:04:10 2009 +0100
+++ b/java/HrisniciSpameri/web/graf.jspx	Sun Mar 01 17:16:53 2009 +0100
@@ -5,8 +5,6 @@
           xmlns:cewolf="http://cewolf.sourceforge.net/taglib/cewolf.tld"
           version="2.0">
 
-    <h2>Graf</h2>
-
     <jsp:useBean id="casovyGrafUtoku" class="cz.frantovo.hrisniciSpameri.grafy.CasovyGrafUtoku" />
 
 
diff -r fd29fd5a8e29 -r d41dc2f3380d java/HrisniciSpameri/web/index.jsp
--- a/java/HrisniciSpameri/web/index.jsp	Sun Mar 01 13:04:10 2009 +0100
+++ b/java/HrisniciSpameri/web/index.jsp	Sun Mar 01 17:16:53 2009 +0100
@@ -15,11 +15,7 @@
         <h1>Hříšníci spameři</h1>
 
         <jsp:include page="souhrn.jspx"/>
-        <c:choose>
-            <c:when test="${param.graf == 'ano'}">
-                <jsp:include page="graf.jspx"/>
-            </c:when>
-        </c:choose>
+        
 
         <div id="licence">Program je vydán pod licencí: <a href="licence.txt">GNU Affero GPL</a>. A zdrojové kódy jsou ke stažení: <a href="HrisniciSpameri-src.zip">HrisniciSpameri-src.zip</a><a href="HrisniciSpameri-src.zip.SHA-512">.</a></div>
 
diff -r fd29fd5a8e29 -r d41dc2f3380d java/HrisniciSpameri/web/seznamCilu.jspx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/HrisniciSpameri/web/seznamCilu.jspx	Sun Mar 01 17:16:53 2009 +0100
@@ -0,0 +1,24 @@
+<?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:f="http://java.sun.com/jsp/jstl/functions"
+          version="2.0">
+
+    <p><a onclick="JavaScript: zobrazNeboSkryj('seznamCilu')" href="#">Seznam cílů</a></p>
+    <div id="seznamCilu">
+        <ul>
+            <c:forEach var="c" items="${denniSouhrn.seznamCilu}">
+                <li>
+                    <c:choose>
+                        <c:when test="${c.url == null}">
+                            <c:out value="${c.nazev}"/>
+                        </c:when>
+                        <c:otherwise>
+                            <a href="${f:escapeXml(c.url)}"><c:out value="${c.nazev}"/></a>
+                        </c:otherwise>
+                    </c:choose>
+                </li>
+            </c:forEach>
+        </ul>
+    </div>
+</jsp:root>
\ No newline at end of file
diff -r fd29fd5a8e29 -r d41dc2f3380d java/HrisniciSpameri/web/souhrn.jspx
--- a/java/HrisniciSpameri/web/souhrn.jspx	Sun Mar 01 13:04:10 2009 +0100
+++ b/java/HrisniciSpameri/web/souhrn.jspx	Sun Mar 01 17:16:53 2009 +0100
@@ -4,83 +4,23 @@
           xmlns:f="http://java.sun.com/jsp/jstl/functions"
           version="2.0">
 
-    <jsp:useBean id="denniSouhrn" class="cz.frantovo.hrisniciSpameri.DenniSouhrn" scope="page"/>
+    <jsp:useBean id="denniSouhrn" class="cz.frantovo.hrisniciSpameri.DenniSouhrn" scope="request"/>
     <jsp:setProperty name="denniSouhrn" property="zacatekString" value="${param.zacatek}"/>
     <jsp:setProperty name="denniSouhrn" property="konecString" value="${param.konec}"/>
     <jsp:setProperty name="denniSouhrn" property="cilString" value="${param.cil}"/>
 
 
-    <p><a onclick="JavaScript: zobrazNeboSkryj('seznamCilu')" href="#">Seznam cílů</a></p>
-    <div id="seznamCilu">
-        <ul>
-            <c:forEach var="c" items="${denniSouhrn.seznamCilu}">
-                <li>
-                    <c:choose>
-                        <c:when test="${c.url == null}">
-                            <c:out value="${c.nazev}"/>
-                        </c:when>
-                        <c:otherwise>
-                            <a href="${f:escapeXml(c.url)}"><c:out value="${c.nazev}"/></a>
-                        </c:otherwise>
-                    </c:choose>
-                </li>
-            </c:forEach>
-        </ul>
-    </div>
+    <jsp:include page="seznamCilu.jspx"/>
 
+    <h2>Filtr</h2>
+    <jsp:include page="filtr.jspx"/>
 
     <h2>Denní souhrn</h2>
-    <form action="#" method="get">
-        <fieldset>
-            <label>Začátek: <input name="zacatek" type="text" value="${denniSouhrn.zacatek}"/></label><br/>
-            <label title="Pokud konec nezadáte, zobrazí se souhrn za jeden den – začátek">Konec: <input name="konec" type="text" value="${denniSouhrn.konec}"/></label><br/>
-            <label>Cíl: <select name="cil">
-                    <option value="0">Všechny cíle</option>
-                    <c:forEach var="c" items="${denniSouhrn.seznamCilu}">
-                        <c:choose>
-                            <c:when test="${c.id == denniSouhrn.cil}">
-                                <option value="${c.id}" selected="selected"><c:out value="${c.nazev}"/></option>
-                            </c:when>
-                            <c:otherwise>
-                                <option value="${c.id}"><c:out value="${c.nazev}"/></option>
-                            </c:otherwise>
-                        </c:choose>
-                    </c:forEach>
-            </select></label><br/>
-            <input name="graf" type="hidden" value="${param.graf}"/>
-            <button>Zobrazit</button>
-        </fieldset>
-    </form>
+    <jsp:include page="tabulkaSouhrnu.jspx"/>
 
-    <table class="sortable" id="seznamHrisniku">
-        <thead>
-            <tr>
-                <td title="Zaznamenaná IP">IP adresa</td>
-                <td title="Dodatečně přeložené jméno">Doména</td>
-                <td title="Kolikrát spamoval">Počet pokusů</td>
-                <td title="Den (posledního) pokusu">Datum</td>
-                <td title="Kde spamoval">Cíl útoku</td>
-            </tr>
-        </thead>
-        <tbody>
-            <c:forEach var="s" items="${denniSouhrn.souhrn}">
-                <tr>
-                    <td><c:out value="${s.adresa.ip}"/></td>
-                    <td><c:out value="${s.adresa.domena}"/></td>
-                    <td class="cislo"><c:out value="${s.pocet}"/></td>
-                    <td><c:out value="${s.den}"/></td>
-                    <td><c:choose>
-                            <c:when test="${s.cil.url == null}">
-                                <c:out value="${s.cil.nazev}"/>
-                            </c:when>
-                            <c:otherwise>
-                                <a href="${f:escapeXml(s.cil.url)}"><c:out value="${s.cil.nazev}"/></a>
-                            </c:otherwise>
-                        </c:choose>
-                    </td>
-                </tr>
-            </c:forEach>
-        </tbody>
-    </table>   
+    <c:if test="${param.graf == 'ano'}">
+        <h2>Graf</h2>
+        <jsp:include page="graf.jspx"/>
+    </c:if>
 
 </jsp:root>
diff -r fd29fd5a8e29 -r d41dc2f3380d java/HrisniciSpameri/web/tabulkaSouhrnu.jspx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/HrisniciSpameri/web/tabulkaSouhrnu.jspx	Sun Mar 01 17:16:53 2009 +0100
@@ -0,0 +1,37 @@
+<?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:f="http://java.sun.com/jsp/jstl/functions"
+          version="2.0">
+
+    <table class="sortable" id="seznamHrisniku">
+        <thead>
+            <tr>
+                <td title="Zaznamenaná IP">IP adresa</td>
+                <td title="Dodatečně přeložené jméno">Doména</td>
+                <td title="Kolikrát spamoval">Počet pokusů</td>
+                <td title="Den (posledního) pokusu">Datum</td>
+                <td title="Kde spamoval">Cíl útoku</td>
+            </tr>
+        </thead>
+        <tbody>
+            <c:forEach var="s" items="${denniSouhrn.souhrn}">
+                <tr>
+                    <td><c:out value="${s.adresa.ip}"/></td>
+                    <td><c:out value="${s.adresa.domena}"/></td>
+                    <td class="cislo"><c:out value="${s.pocet}"/></td>
+                    <td><c:out value="${s.den}"/></td>
+                    <td><c:choose>
+                            <c:when test="${s.cil.url == null}">
+                                <c:out value="${s.cil.nazev}"/>
+                            </c:when>
+                            <c:otherwise>
+                                <a href="${f:escapeXml(s.cil.url)}"><c:out value="${s.cil.nazev}"/></a>
+                            </c:otherwise>
+                        </c:choose>
+                    </td>
+                </tr>
+            </c:forEach>
+        </tbody>
+    </table>   
+</jsp:root>
\ No newline at end of file