From: <pp...@us...> - 2008-06-28 17:25:36
|
Revision: 1798 http://simpletest.svn.sourceforge.net/simpletest/?rev=1798&view=rev Author: pp11 Date: 2008-06-28 10:25:32 -0700 (Sat, 28 Jun 2008) Log Message: ----------- Fix for patch [ 1967705 ] project contains invalid XML and HTML (Karl DeBisschop - kdebisschop) Modified Paths: -------------- simpletest/trunk/docs/simpletest.org/js/jquery.sparkline.js simpletest/trunk/packages/bundled_docs.xslt simpletest/trunk/packages/package.xml simpletest/trunk/packages/simpletest.org/template.html simpletest/trunk/test/site/counting_frameset.html simpletest/trunk/test/site/frameset.html simpletest/trunk/test/site/link_confirm.php simpletest/trunk/test/site/nested_frameset.html simpletest/trunk/test/site/one_page_frameset.html Modified: simpletest/trunk/docs/simpletest.org/js/jquery.sparkline.js =================================================================== --- simpletest/trunk/docs/simpletest.org/js/jquery.sparkline.js 2008-06-28 16:53:03 UTC (rev 1797) +++ simpletest/trunk/docs/simpletest.org/js/jquery.sparkline.js 2008-06-28 17:25:32 UTC (rev 1798) @@ -28,8 +28,12 @@ var co = document.createElement("canvas"); - if ( co.getContext ) o.css({ display: "inline" }); - else return false; + if ( co.getContext ) { + o.css({ display: "inline" }); + } else { + return false; + } + co.style.height = h; co.style.width = w; @@ -61,10 +65,12 @@ } else { y = 0; } + y = 3 * i; c.lineTo(x, y); } c.stroke(); +alert(c); o.css({ display:"inline" }); } } \ No newline at end of file Modified: simpletest/trunk/packages/bundled_docs.xslt =================================================================== --- simpletest/trunk/packages/bundled_docs.xslt 2008-06-28 16:53:03 UTC (rev 1797) +++ simpletest/trunk/packages/bundled_docs.xslt 2008-06-28 17:25:32 UTC (rev 1798) @@ -185,12 +185,12 @@ </xsl:template> <xsl:template match="section"> - <p> + <h2> <a class="target"> - <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> - <h2><xsl:value-of select="@title"/></h2> - </a> - </p> + <xsl:attribute name="name"><xsl:value-of select="@name" /></xsl:attribute> + </a> + <xsl:value-of select="@title" /> + </h2> <xsl:apply-templates/> </xsl:template> Modified: simpletest/trunk/packages/package.xml =================================================================== --- simpletest/trunk/packages/package.xml 2008-06-28 16:53:03 UTC (rev 1797) +++ simpletest/trunk/packages/package.xml 2008-06-28 17:25:32 UTC (rev 1798) @@ -47,9 +47,6 @@ stable release 1.0 version. It features many improvements to the HTML form parsing and exposure of the underlying web browser. There are also numerous minor improvements and bug fixes.</notes> - <deps> - <dep type="php" rel="ge" version="4.2.2" optional="no"/> - </deps> <provides type="class" name="PHPUnit_TestCase" extends="SimpleTestCase" /> <provides type="function" name="PHPUnit_TestCase::assertEquals" /> <provides type="function" name="PHPUnit_TestCase::assertNotNull" /> @@ -563,6 +560,9 @@ <provides type="function" name="NestingGroupTag::paintEnd" /> <provides type="function" name="NestingGroupTag::getSize" /> <provides type="function" name="SimpleTestXmlParser::parse" /> + <deps> + <dep type="php" rel="ge" version="4.2.2" optional="no"/> + </deps> <filelist> <file role="data" baseinstalldir="simpletest" md5sum="57b8d745384127342f95660d97e1c9c2" name="adapters/CVS/Entries"/> <file role="data" baseinstalldir="simpletest" md5sum="2b7250390148247001cadb8a5fbfadd3" name="adapters/CVS/Repository"/> Modified: simpletest/trunk/packages/simpletest.org/template.html =================================================================== --- simpletest/trunk/packages/simpletest.org/template.html 2008-06-28 16:53:03 UTC (rev 1797) +++ simpletest/trunk/packages/simpletest.org/template.html 2008-06-28 17:25:32 UTC (rev 1798) @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> Modified: simpletest/trunk/test/site/counting_frameset.html =================================================================== --- simpletest/trunk/test/site/counting_frameset.html 2008-06-28 16:53:03 UTC (rev 1797) +++ simpletest/trunk/test/site/counting_frameset.html 2008-06-28 17:25:32 UTC (rev 1798) @@ -4,7 +4,7 @@ <frame name="a" src="cookie_based_counter.php" /> <frame name="b" src="cookie_based_counter.php" /> <noframes> - This content is for no frames only. + <body>This content is for no frames only.</body> </noframes> </frameset> </html> \ No newline at end of file Modified: simpletest/trunk/test/site/frameset.html =================================================================== --- simpletest/trunk/test/site/frameset.html 2008-06-28 16:53:03 UTC (rev 1797) +++ simpletest/trunk/test/site/frameset.html 2008-06-28 17:25:32 UTC (rev 1798) @@ -4,7 +4,7 @@ <frame name="aaa" src="frame_a.html" /> <frame name="bbb" src="frame_b.html" /> <noframes> - This content is for no frames only. + <body>This content is for no frames only.</body> </noframes> </frameset> </html> \ No newline at end of file Modified: simpletest/trunk/test/site/link_confirm.php =================================================================== --- simpletest/trunk/test/site/link_confirm.php 2008-06-28 16:53:03 UTC (rev 1797) +++ simpletest/trunk/test/site/link_confirm.php 2008-06-28 17:25:32 UTC (rev 1798) @@ -8,13 +8,11 @@ <a href="http://www.lastcraft.com/simple_test.php">SimpleTest</a> test suite. </p> - <p> - <ul> - <li><a href="<?php print my_path(); ?>network_confirm.php">Absolute</a></li> - <li><a href="network_confirm.php">Relative</a></li> - <li><a href="network_confirm.php" id="1">Id</a></li> - <li><a href="network_confirm.php">märcêl kiek'eboe</a></li> - </ul> - </p> + <ul> + <li><a href="<?php print my_path(); ?>network_confirm.php">Absolute</a></li> + <li><a href="network_confirm.php">Relative</a></li> + <li><a href="network_confirm.php" id="1">Id</a></li> + <li><a href="network_confirm.php">märcêl kiek'eboe</a></li> + </ul> </body> </html> Modified: simpletest/trunk/test/site/nested_frameset.html =================================================================== --- simpletest/trunk/test/site/nested_frameset.html 2008-06-28 16:53:03 UTC (rev 1797) +++ simpletest/trunk/test/site/nested_frameset.html 2008-06-28 17:25:32 UTC (rev 1798) @@ -4,7 +4,7 @@ <frame name="pair" src="frameset.html" /> <frame name="messy" src="messy_frameset.html" /> <noframes> - This content is for no frames only. + <body>This content is for no frames only.</body> </noframes> </frameset> </html> \ No newline at end of file Modified: simpletest/trunk/test/site/one_page_frameset.html =================================================================== --- simpletest/trunk/test/site/one_page_frameset.html 2008-06-28 16:53:03 UTC (rev 1797) +++ simpletest/trunk/test/site/one_page_frameset.html 2008-06-28 17:25:32 UTC (rev 1798) @@ -3,7 +3,7 @@ <frameset rows="*"> <frame src="network_confirm.php" /> <noframes> - This content is for no frames only. + <body>This content is for no frames only.</body> </noframes> </frameset> </html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |