Author: ornicar2
Date: 2010-01-20 23:06:26 +0100 (Wed, 20 Jan 2010)
New Revision: 26956
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmFrontLinkTagTest.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/link/dmFrontLinkResource.php
Log:
[Diem]
- fixed current class on links to @homepage
Modified: plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmFrontLinkTagTest.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmFrontLinkTagTest.php
2010-01-20 21:30:22 UTC (rev 26955)
+++ plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmFrontLinkTagTest.php
2010-01-20 22:06:26 UTC (rev 26956)
@@ -6,7 +6,7 @@
if(sfConfig::get('sf_app') == 'front' &&
class_exists('dmFrontPluginConfiguration', false))
{
- $t = new lime_test(27);
+ $t = new lime_test();
}
else
{
@@ -47,8 +47,14 @@
$scriptName = $helper->get('request')->getScriptName();
$t->diag('Current cli script name = '.$scriptName);
-$t->is((string)£link(), (string)£link($home), '£link($home) is £link()');
+$t->like(£link()->render(), '|<a class="link dm_current|', '£link() has class
dm_current');
+$t->is((string)£link($home), (string)£link(), '£link($home) is £link()');
+
+$t->is((string)£link('@homepage'), (string)£link($home), '£link("@homepage")
is £link()');
+
+$t->is((string)£link('main/root'), (string)£link($home), '£link("main/root")
is £link()');
+
$t->is(£link()->getHref(), $scriptName, 'root href is '.$scriptName);
$t->is(£link()->getText(), $home->name, 'root link text is '.$home->name);
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/link/dmFrontLinkResource.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/link/dmFrontLinkResource.php
2010-01-20 21:30:22 UTC (rev 26955)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/link/dmFrontLinkResource.php
2010-01-20 22:06:26 UTC (rev 26956)
@@ -61,6 +61,11 @@
*/
$this->params = dmString::getDataFromUrl($source);
$source = dmString::getBaseFromUrl($source);
+
+ if ('@homepage' === $source)
+ {
+ $source = 'main/root';
+ }
if (strncmp($source, 'page:', 5) === 0)
{
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
