# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1272410962 -7200
# Node ID 6d9647a51193a1420f1c538dfe85512c523c18db
# Parent  b278b6b2d5527218d99d3ac0c3627227aea3de42
SVG: validní i v XHTML.

diff -r b278b6b2d552 -r 6d9647a51193 java/nekurak.net-web/web/WEB-INF/tags/nekurak/hlasovani.tag
--- a/java/nekurak.net-web/web/WEB-INF/tags/nekurak/hlasovani.tag	Wed Apr 28 00:36:21 2010 +0200
+++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/hlasovani.tag	Wed Apr 28 01:29:22 2010 +0200
@@ -25,23 +25,24 @@
 
     <c:choose>
 	<c:when test="${svgUvnitrXhtml}">
-	    <svg xmlns="http://www.w3.org/2000/svg"
-		 xmlns:xlink="http://www.w3.org/1999/xlink"
-		 width="200" height="200">
+	    <svg:svg xmlns:svg="http://www.w3.org/2000/svg"
+		     xmlns:xlink="http://www.w3.org/1999/xlink"
+		     version="1.1" baseProfile="full"
+		     width="200" height="200">
 
 
-		<style type="text/css">
+		<svg:style type="text/css">
 		    rect.ne {
-			fill:  url(#ne_prechod);
+			fill:  url(#ne_prechod_${podnik});
 			stroke: black;
 		    }
 		    rect.ano {
-			fill: url(#ano_prechod);
+			fill: url(#ano_prechod_${podnik});
 			stroke: black;
 		    }
 
 		    a:hover rect.ano, a:hover rect.ne {
-			fill: url(#zvyrazneny_prechod);
+			fill: url(#zvyrazneny_prechod_${podnik});
 		    }
 
 		    a:hover text {
@@ -55,7 +56,7 @@
 
 
 		    rect.pozadi {
-			fill: url(#pozadi_prechod);
+			fill: url(#pozadi_prechod_${podnik});
 		    }
 
 		    text {
@@ -63,50 +64,50 @@
 			font-family: Sans;
 		    }
 
-		</style>
+		</svg:style>
 
 		<!-- pozadí – přechod -->
-		<defs>
-		    <linearGradient id="pozadi_prechod" x1="0%" y1="0%" x2="100%" y2="100%">
-			<stop offset="20%" style="stop-color:rgb(245,245,255); stop-opacity:0.5"/>
-			<stop offset="100%" style="stop-color:silver; stop-opacity:0.8"/>
-		    </linearGradient>
-		</defs>
+		<svg:defs>
+		    <svg:linearGradient id="pozadi_prechod_${podnik}" x1="0%" y1="0%" x2="100%" y2="100%">
+			<svg:stop offset="20%" style="stop-color:rgb(245,245,255); stop-opacity:0.5"/>
+			<svg:stop offset="100%" style="stop-color:silver; stop-opacity:0.8"/>
+		    </svg:linearGradient>
+		</svg:defs>
 
 		<!-- nekuřácký graf – přechod -->
-		<defs>
-		    <linearGradient id="ne_prechod" x1="0%" y1="0%" x2="100%" y2="100%">
-			<stop offset="0%" style="stop-color:white; stop-opacity:1"/>
-			<stop offset="100%" style="stop-color:blue; stop-opacity:1"/>
-		    </linearGradient>
-		</defs>
+		<svg:defs>
+		    <svg:linearGradient id="ne_prechod_${podnik}" x1="0%" y1="0%" x2="100%" y2="100%">
+			<svg:stop offset="0%" style="stop-color:white; stop-opacity:1"/>
+			<svg:stop offset="100%" style="stop-color:blue; stop-opacity:1"/>
+		    </svg:linearGradient>
+		</svg:defs>
 
 		<!-- zvýrazněný graf – přechod -->
-		<defs>
-		    <linearGradient id="zvyrazneny_prechod" x1="0%" y1="0%" x2="100%" y2="100%">
-			<stop offset="0%" style="stop-color:white; stop-opacity:1"/>
-			<stop offset="100%" style="stop-color:green; stop-opacity:1"/>
-		    </linearGradient>
-		</defs>
+		<svg:defs>
+		    <svg:linearGradient id="zvyrazneny_prechod_${podnik}" x1="0%" y1="0%" x2="100%" y2="100%">
+			<svg:stop offset="0%" style="stop-color:white; stop-opacity:1"/>
+			<svg:stop offset="100%" style="stop-color:green; stop-opacity:1"/>
+		    </svg:linearGradient>
+		</svg:defs>
 
 		<!-- kuřácký graf – přechod -->
-		<defs>
-		    <linearGradient id="ano_prechod" x1="0%" y1="0%" x2="100%" y2="100%">
-			<stop offset="0%" style="stop-color:white; stop-opacity:1"/>
-			<stop offset="100%" style="stop-color:red; stop-opacity:1"/>
-		    </linearGradient>
-		</defs>
+		<svg:defs>
+		    <svg:linearGradient id="ano_prechod_${podnik}" x1="0%" y1="0%" x2="100%" y2="100%">
+			<svg:stop offset="0%" style="stop-color:white; stop-opacity:1"/>
+			<svg:stop offset="100%" style="stop-color:red; stop-opacity:1"/>
+		    </svg:linearGradient>
+		</svg:defs>
 
 		<!-- pozadí a linka -->
-		<rect x="0" y="0" width="200" height="200" class="pozadi"/>
-		<line x1="10" y1="180" x2="190" y2="180" class="ramecek"/>
+		<svg:rect x="0" y="0" width="200" height="200" class="pozadi"/>
+		<svg:line x1="10" y1="180" x2="190" y2="180" class="ramecek"/>
 
 		<!-- nadpis grafu -->
-		<text x="60" y="20"><fmt:message key="hlasovani.graf.nadpis"/>:</text>
+		<svg:text x="60" y="20"><fmt:message key="hlasovani.graf.nadpis"/>:</svg:text>
 
 		<!-- žádné hlasy -->
 		<c:if test="${hlasuAno == 0 &amp;&amp; hlasuNe == 0}">
-		    <text x="30" y="100"><fmt:message key="hlasovani.graf.zadneHlasy"/></text>
+		    <svg:text x="30" y="100"><fmt:message key="hlasovani.graf.zadneHlasy"/></svg:text>
 		</c:if>
 
 		<!-- vypočteme si výšky sloupců grafu -->
@@ -117,20 +118,20 @@
 		<fmt:message key="hlasovani.graf.popisSloupce" var="hlasuNeLokalizace">
 		    <fmt:param value="${hlasuNe}"/>
 		</fmt:message>
-		<a xlink:href="javascript:hlasovani.hlasuj(${podnik}, false);" xlink:title="${hlasuNeLokalizace}">
-		    <text x="30" y="195" class="ne"><fmt:message key="hlasovani.graf.nekourit"/></text>
-		    <rect x="30" y="${180 - hlasuNeVyska}" width="50" height="${hlasuNeVyska}" class="ne"/>
-		</a>
+		<svg:a xlink:href="javascript:hlasovani.hlasuj(${podnik}, false);" xlink:title="${hlasuNeLokalizace}">
+		    <svg:text x="30" y="195" class="ne"><fmt:message key="hlasovani.graf.nekourit"/></svg:text>
+		    <svg:rect x="30" y="${180 - hlasuNeVyska}" width="50" height="${hlasuNeVyska}" class="ne"/>
+		</svg:a>
 
 		<!-- kuřáci -->
 		<fmt:message key="hlasovani.graf.popisSloupce" var="hlasuAnoLokalizace">
 		    <fmt:param value="${hlasuAno}"/>
 		</fmt:message>
-		<a xlink:href="javascript:hlasovani.hlasuj(${podnik}, true);" xlink:title="${hlasuAnoLokalizace}">
-		    <text x="130" y="195" class="ano"><fmt:message key="hlasovani.graf.kourit"/></text>
-		    <rect x="120" y="${180 - hlasuAnoVyska}" width="50" height="${hlasuAnoVyska}" class="ano"/>
-		</a>
-	    </svg>
+		<svg:a xlink:href="javascript:hlasovani.hlasuj(${podnik}, true);" xlink:title="${hlasuAnoLokalizace}">
+		    <svg:text x="130" y="195" class="ano"><fmt:message key="hlasovani.graf.kourit"/></svg:text>
+		    <svg:rect x="120" y="${180 - hlasuAnoVyska}" width="50" height="${hlasuAnoVyska}" class="ano"/>
+		</svg:a>
+	    </svg:svg>
 	</c:when>
 	<c:otherwise>
 	    <object data="hlasovani-svg.jsp?podnik=${podnik}&amp;amp;hlasuAno=${hlasuAno}&amp;amp;hlasuNe=${hlasuNe}" type="image/svg+xml"/>
diff -r b278b6b2d552 -r 6d9647a51193 java/nekurak.net-web/web/WEB-INF/tags/nekurak/stranka.tag
--- a/java/nekurak.net-web/web/WEB-INF/tags/nekurak/stranka.tag	Wed Apr 28 00:36:21 2010 +0200
+++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/stranka.tag	Wed Apr 28 01:29:22 2010 +0200
@@ -10,7 +10,8 @@
     <jsp:directive.attribute name="titulek" type="java.lang.String" required="false"/>
     <jsp:directive.tag description="Obaluje všechny stránky – obsahuje XHTML záhlaví a zápatí"/>
 
-    <jsp:output doctype-system="http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd"
+    <jsp:output doctype-public="-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN"
+		doctype-system="http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd"
 		doctype-root-element="html"
 		omit-xml-declaration="false"/>