From: <mlu...@us...> - 2011-10-03 20:13:11
|
Revision: 37932 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37932&view=rev Author: mlustenberg Date: 2011-10-03 20:13:02 +0000 (Mon, 03 Oct 2011) Log Message: ----------- [MOD] changed html attribute class="wiki" to class="wiki page" when parsing ((Page)) This modification simplifies the conversion of html links to the Wiki Syntax (Visual Wiki) Modified Paths: -------------- trunk/lib/core/WikiParser/OutputLink.php trunk/lib/test/editlib/ParseToWysiwyg_LinkTest.php Modified: trunk/lib/core/WikiParser/OutputLink.php =================================================================== --- trunk/lib/core/WikiParser/OutputLink.php 2011-10-03 20:02:23 UTC (rev 37931) +++ trunk/lib/core/WikiParser/OutputLink.php 2011-10-03 20:13:02 UTC (rev 37932) @@ -79,7 +79,7 @@ return $this->outputLink( $description, array( 'href' => call_user_func( $this->wikiBuilder, $page ) . $this->anchor, 'title' => $title, - 'class' => 'wiki', + 'class' => 'wiki page', ) ); } else { return $description . $this->outputLink( '?', array( Modified: trunk/lib/test/editlib/ParseToWysiwyg_LinkTest.php =================================================================== --- trunk/lib/test/editlib/ParseToWysiwyg_LinkTest.php 2011-10-03 20:02:23 UTC (rev 37931) +++ trunk/lib/test/editlib/ParseToWysiwyg_LinkTest.php 2011-10-03 20:13:02 UTC (rev 37932) @@ -34,6 +34,9 @@ function setUp() { $_SERVER['HTTP_HOST'] = ''; // editlib expects that HTTP_HOST is defined $_SERVER['SERVER_NAME'] = 'myserver'; // the ParserLib expects the servername to be set + + global $prefs; + $prefs['feature_sefurl'] = 'n'; // default $this->el = new EditLib(); @@ -315,7 +318,7 @@ * Test links to internal wiki pages */ function testWikiPage() { - $this->markTestIncomplete('Work in progress.'); + global $tikilib; @@ -339,7 +342,7 @@ * - existing page */ $inData = "(($homePage))"; - $ex = '<a href="tiki-index.php?page=HomePage" title="HomePage" class="wiki">HomePage</a>'; + $ex = '<a href="tiki-index.php?page=HomePage" title="HomePage" class="wiki page">HomePage</a>'; $out = trim( $this->el->parseToWysiwyg($inData) ); $this->assertEquals($ex, $out); @@ -349,7 +352,7 @@ * - description */ $inData = "(($homePage|The Home Page))"; - $ex = '<a href="tiki-index.php?page=HomePage" title="HomePage" class="wiki">The Home Page</a>'; + $ex = '<a href="tiki-index.php?page=HomePage" title="HomePage" class="wiki page">The Home Page</a>'; $out = trim($this->el->parseToWysiwyg($inData)); $this->assertEquals($ex, $out); @@ -360,11 +363,11 @@ * - description */ $inData = "(($homePage|#Get_Started_using_Admin_Panel|Home Page, Heading \"Admin Panel\"))"; - $ex = '<a href="tiki-index.php?page=HomePage#Get_Started_using_Admin_Panel" title="HomePage" class="wiki">Home Page, Heading "Admin Panel"</a>'; + $ex = '<a href="tiki-index.php?page=HomePage#Get_Started_using_Admin_Panel" title="HomePage" class="wiki page">Home Page, Heading "Admin Panel"</a>'; $out = trim($this->el->parseToWysiwyg($inData)); $this->assertEquals($ex, $out); - + $this->markTestIncomplete('Work in progress.'); /* * Default behavior -> class="wiki wikinew" * @@ -379,14 +382,14 @@ /* - * CKE behavior -> class="wiki" + * CKE behavior -> class="wiki page" * * - inexistent page * - link to an anchor * - description */ $inData = "(($noPage|#anchor|Page does not exist))"; - $ex = '<a href="tiki-index.php?page=Page+does+not+exist+not+exist#anchor" title="Page does not exist not exist" class="wiki">Page does not exist</a>'; + $ex = '<a href="tiki-index.php?page=Page+does+not+exist+not+exist#anchor" title="Page does not exist not exist" class="wiki page">Page does not exist</a>'; $out = trim($this->el->parseToWysiwyg($inData)); $this->assertEquals($ex, $out); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |