Validní SVG ~ hlasovani-svg.jsp
authorFrantišek Kučera <franta-hg@frantovo.cz>
Wed, 28 Apr 2010 00:04:13 +0200
changeset 112b139d35b4faf
parent 111 401cc563a0c1
child 113 55af119b8c2b
Validní SVG ~ hlasovani-svg.jsp
java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties
java/nekurak.net-web/web/WEB-INF/tags/nekurak/hlasovani.tag
java/nekurak.net-web/web/hlasovani-svg.jsp
     1.1 --- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Tue Apr 27 22:41:04 2010 +0200
     1.2 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Wed Apr 28 00:04:13 2010 +0200
     1.3 @@ -76,4 +76,6 @@
     1.4  hlasovani.graf.nadpis=M\u011Blo by se tu
     1.5  hlasovani.graf.zadneHlasy=(zat\u00EDm nikdo nehlasoval)
     1.6  hlasovani.graf.popisSloupce=hlas\u016F: {0}
     1.7 +hlasovani.graf.kourit=kou\u0159it
     1.8 +hlasovani.graf.nekourit=nekou\u0159it
     1.9  hlasovani.TODO=TODO: lokalizovat Javascript
     2.1 --- a/java/nekurak.net-web/web/WEB-INF/tags/nekurak/hlasovani.tag	Tue Apr 27 22:41:04 2010 +0200
     2.2 +++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/hlasovani.tag	Wed Apr 28 00:04:13 2010 +0200
     2.3 @@ -3,6 +3,8 @@
     2.4  	  xmlns:c="http://java.sun.com/jsp/jstl/core"
     2.5  	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
     2.6  	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
     2.7 +	  xmlns:svg="http://www.w3.org/2000/svg"
     2.8 +	  xmlns:xlink="http://www.w3.org/1999/xlink"
     2.9  	  version="2.0">
    2.10  
    2.11      <jsp:directive.attribute name="podnik" type="java.lang.Integer" required="true" description="ID podniku"/>
    2.12 @@ -25,9 +27,11 @@
    2.13  
    2.14      <c:choose>
    2.15  	<c:when test="${svgUvnitrXhtml}">
    2.16 -	    <svg width="200" height="200"
    2.17 +	    <svg version="1.1"
    2.18 +		 baseProfile="full"
    2.19  		 xmlns="http://www.w3.org/2000/svg"
    2.20 -		 xmlns:xlink="http://www.w3.org/1999/xlink">
    2.21 +		 xmlns:xlink="http://www.w3.org/1999/xlink"
    2.22 +		 width="200" height="200">
    2.23  
    2.24  
    2.25  		<style type="text/css">
    2.26 @@ -118,7 +122,7 @@
    2.27  		    <fmt:param value="${hlasuNe}"/>
    2.28  		</fmt:message>
    2.29  		<a xlink:href="javascript:hlasovani.hlasuj(${podnik}, false);" xlink:title="${hlasuNeLokalizace}">
    2.30 -		    <text x="30" y="195" class="ne">nekouřit</text>
    2.31 +		    <text x="30" y="195" class="ne"><fmt:message key="hlasovani.graf.nekourit"/></text>
    2.32  		    <rect x="30" y="${180 - hlasuNeVyska}" width="50" height="${hlasuNeVyska}" class="ne"/>
    2.33  		</a>
    2.34  
    2.35 @@ -127,7 +131,7 @@
    2.36  		    <fmt:param value="${hlasuAno}"/>
    2.37  		</fmt:message>
    2.38  		<a xlink:href="javascript:hlasovani.hlasuj(${podnik}, true);" xlink:title="${hlasuAnoLokalizace}">
    2.39 -		    <text x="130" y="195" class="ano">kouřit</text>
    2.40 +		    <text x="130" y="195" class="ano"><fmt:message key="hlasovani.graf.kourit"/></text>
    2.41  		    <rect x="120" y="${180 - hlasuAnoVyska}" width="50" height="${hlasuAnoVyska}" class="ano"/>
    2.42  		</a>
    2.43  	    </svg>
     3.1 --- a/java/nekurak.net-web/web/hlasovani-svg.jsp	Tue Apr 27 22:41:04 2010 +0200
     3.2 +++ b/java/nekurak.net-web/web/hlasovani-svg.jsp	Wed Apr 28 00:04:13 2010 +0200
     3.3 @@ -3,9 +3,13 @@
     3.4  	  xmlns:c="http://java.sun.com/jsp/jstl/core"
     3.5  	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
     3.6  	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
     3.7 +	  xmlns:svg="http://www.w3.org/2000/svg"
     3.8 +	  xmlns:xlink="http://www.w3.org/1999/xlink"
     3.9  	  version="2.0">
    3.10      <jsp:directive.page contentType="image/svg+xml"/>
    3.11  
    3.12 +    <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
    3.13 +
    3.14      <!-- na této úrovni nemusíme ošetřovat vstup – jako parametry projdou jen správné datové typy -->
    3.15      <nk:hlasovani svgUvnitrXhtml="true" hlasuAno="${param.hlasuAno}" hlasuNe="${param.hlasuNe}" podnik="${param.podnik}"/>
    3.16