Author: ornicar2
Date: 2010-01-24 16:08:33 +0100 (Sun, 24 Jan 2010)
New Revision: 27129

Added:
   plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php
Removed:
   plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmLinkTag.php
Modified:
   plugins/diemPlugin/trunk/dmAdminPlugin/config/dm/services.yml
   plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/link/dmAdminLinkTag.php
   plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
   
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmServiceContainerLoaderConfiguration.php
   plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmFrontLinkTagTest.php
   plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmHelperTest.php
   plugins/diemPlugin/trunk/dmFrontPlugin/config/dm/services.yml
   
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/link/tag/dmFrontLinkTagPage.php
Log:
[Diem]
- added helper.options.use_beaf propagation to link services in service 
container loader
- added tests for helper use_beaf and link use_beaf
- fixed link_tag_record default options in front services.yml

Modified: plugins/diemPlugin/trunk/dmAdminPlugin/config/dm/services.yml
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/config/dm/services.yml       
2010-01-24 14:51:04 UTC (rev 27128)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/config/dm/services.yml       
2010-01-24 15:08:33 UTC (rev 27129)
@@ -32,6 +32,7 @@
   gapi.class:                 dmGapi            # Responsible for fetching 
data from google analytics
 
   link_tag.class:             dmAdminLinkTag    # Responsible for rendering 
admin link tags with the £link helper
+  link_tag.options:           []
 
   theme.options:                                # Override the core theme 
options
     key:                      diem_admin
@@ -107,7 +108,7 @@
   link_tag:
     class:                    %link_tag.class%
     shared:                   false
-    arguments:                [ %link_tag.source%, @service_container ]
+    arguments:                [ %link_tag.source%, @service_container, 
%link_tag.options% ]
 
   admin_sort_table_form:
     class:                    %admin_sort_table_form.class%

Modified: 
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/link/dmAdminLinkTag.php
===================================================================
--- 
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/link/dmAdminLinkTag.php    
    2010-01-24 14:51:04 UTC (rev 27128)
+++ 
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/link/dmAdminLinkTag.php    
    2010-01-24 15:08:33 UTC (rev 27129)
@@ -5,12 +5,12 @@
   protected
   $serviceContainer;
   
-  public function __construct($resource, dmAdminBaseServiceContainer 
$serviceContainer)
+  public function __construct($resource, dmAdminBaseServiceContainer 
$serviceContainer, array $options)
   {
     $this->resource         = empty($resource) ? '@homepage' : $resource;
     $this->serviceContainer = $serviceContainer;
     
-    $this->initialize();
+    $this->initialize($options);
   }
   
   public function render()

Modified: 
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
===================================================================
--- 
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php    
    2010-01-24 14:51:04 UTC (rev 27128)
+++ 
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php    
    2010-01-24 15:08:33 UTC (rev 27129)
@@ -62,7 +62,6 @@
     }
   }
   
-  
   public function connect()
   {
     $dispatcher = $this->getService('dispatcher');

Modified: 
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmServiceContainerLoaderConfiguration.php
===================================================================
--- 
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmServiceContainerLoaderConfiguration.php
 2010-01-24 14:51:04 UTC (rev 27128)
+++ 
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmServiceContainerLoaderConfiguration.php
 2010-01-24 15:08:33 UTC (rev 27129)
@@ -46,6 +46,8 @@
     )));
     
     unset($this->config);
+
+    $this->propagateBeaf();
   }
   
   protected function add($service, $key, $configKey)
@@ -58,4 +60,26 @@
       );
     }
   }
+
+  /*
+   * Propagate the helper use_beaf option to all link services
+   */
+  protected function propagateBeaf()
+  {
+    if(dmArray::get($this->container->getParameter('helper.options'), 
'use_beaf'))
+    {
+      foreach($this->container->getServiceIds() as $service)
+      {
+        if (0 === strncmp($service, 'link_tag', 8) && 
$this->container->hasParameter($service.'.options'))
+        {
+          $this->container->setParameter(
+            $service.'.options',
+            array_merge($this->container->getParameter($service.'.options'), 
array(
+              'use_beaf' => true
+            )
+          ));
+        }
+      }
+    }
+  }
 }
\ No newline at end of file

Copied: 
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php 
(from rev 27036, 
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmLinkTag.php)
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php  
                        (rev 0)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php  
2010-01-24 15:08:33 UTC (rev 27129)
@@ -0,0 +1,241 @@
+<?php
+
+abstract class dmBaseLinkTag extends dmHtmlTag
+{
+  protected
+  $resource,
+  $requestContext;
+  
+  protected function initialize(array $options = array())
+  {
+    parent::initialize($options);
+    
+    $this->addAttributeToRemove(array('text', 'current_class', 'parent_class', 
'current_span', 'use_beaf'));
+    
+    $this->addEmptyAttributeToRemove(array('target', 'title'));
+    
+    $this->addClass('link');
+  }
+
+  public function getDefaultOptions()
+  {
+    return array_merge(parent::getDefaultOptions(), array(
+      'current_class' => 'dm_current',
+      'parent_class'  => 'dm_parent',
+      'current_span'  => false,
+      'use_beaf'      => false
+    ));
+  }
+
+  public function isCurrent()
+  {
+    return false;
+  }
+
+  public function isParent()
+  {
+    return false;
+  }
+  
+  /*
+   * @return string baseHref the href without query string
+   */
+  abstract protected function getBaseHref();
+  
+  public function getHrefPrefix()
+  {
+    return sfConfig::get('sf_no_script_name') ? 
$this->requestContext['prefix'] : $this->requestContext['script_name'];
+  }
+  
+  /*
+   * Set text
+   * @return dmLinkTag $this
+   */
+  public function text($v)
+  {
+    return $this->setOption('text', (string) $v);
+  }
+
+  /*
+   * Set title
+   * @return dmLinkTag $this
+   */
+  public function title($v)
+  {
+    return $this->setOption('title', (string) $v);
+  }
+
+  /*
+   * Set text and title
+   * @return dmLinkTag $this
+   */
+  public function textTitle($v)
+  {
+    return $this->text($v)->title($v);
+  }
+
+  /*
+   * Set link target
+   * @return dmLinkTag $this
+   */
+  public function target($v)
+  {
+    if (in_array($v, array('blank', 'parent', 'self', 'top')))
+    {
+      $v = '_'.$v;
+    }
+
+    return $this->setOption('target', strtolower($v));
+  }
+
+  /*
+   * Add an anchor
+   * @return dmLinkTag $this
+   */
+  public function anchor($v)
+  {
+    return $this->setOption('anchor', trim((string) $v, '#'));
+  }
+
+  /*
+   * Add a request parameter
+   * @return dmLinkTag $this
+   */
+  public function param($key, $value)
+  {
+    return $this->params(array($key => $value));
+  }
+
+  /*
+   * Add request parameters
+   * @return dmLinkTag $this
+   */
+  public function params(array $params)
+  {
+    foreach($params as $key => $value)
+    {
+      $params[$key] = $value;
+    }
+
+    return $this->setOption('params', array_merge($this->get('params', 
array()), $params));
+  }
+
+  /*
+   * Whether to display current links with span tag
+   * @return dmLinkTag $this
+   */
+  public function currentSpan($bool)
+  {
+    return $this->setOption('current_span', (bool) $bool);
+  }
+
+  /*
+   * Sets the current css class
+   * @return dmLinkTag $this
+   */
+  public function currentClass($class)
+  {
+    return $this->setOption('current_class', (string) $class);
+  }
+
+  /*
+   * Sets the parent css class
+   * @return dmLinkTag $this
+   */
+  public function parentClass($class)
+  {
+    return $this->setOption('parent_class', (string) $class);
+  }
+
+  public function render()
+  {
+    return $this->doRender('a', $this->getHtmlAttributes(), 
$this->renderText());
+  }
+
+  protected function doRender($tag, $htmlAttributes, $text)
+  {
+    if($this->options['use_beaf'])
+    {
+      return $this->doRenderBeaf($tag, $htmlAttributes, $text);
+    }
+    
+    return '<'.$tag.$htmlAttributes.'>'.$text.'</'.$tag.'>';
+  }
+
+  protected function doRenderBeaf($tag, $htmlAttributes, $text)
+  {
+    if(in_array('beafh', $this->options['class']) || in_array('beafv', 
$this->options['class']))
+    {
+      return '<'.$tag.$htmlAttributes.'><span class="beafore"></span><span 
class="beafin">'.$text.'</span><span class="beafter"></span></span></a>';
+    }
+
+    return '<'.$tag.$htmlAttributes.'>'.$text.'</'.$tag.'>';
+  }
+
+  protected function prepareAttributesForHtml(array $attributes)
+  {
+    $attributes = parent::prepareAttributesForHtml($attributes);
+
+    $attributes['href'] = $this->getBaseHref();
+
+    if (array_key_exists('params', $attributes))
+    {
+      if (!empty($attributes['params']))
+      {
+        $attributes['href'] = $this->buildUrl(
+        dmString::getBaseFromUrl($attributes['href']),
+        array_merge(dmString::getDataFromUrl($attributes['href']), 
$attributes['params'])
+        );
+      }
+      
+      unset($attributes['params']);
+    }
+    
+    if (isset($attributes['anchor']))
+    {
+      $attributes['href'] .= '#'.$attributes['anchor'];
+      
+      unset($attributes['anchor']);
+    }
+
+    // makes unit testing easier
+    ksort($attributes);
+    
+    return $attributes;
+  }
+
+  public function getHref()
+  {
+    return dmArray::get($this->prepareAttributesForHtml($this->options), 
'href');
+  }
+  
+  public function getText()
+  {
+    return $this->renderText();
+  }
+
+  public function getAbsoluteHref()
+  {
+    $href = $this->getHref();
+    
+    $uriPrefix = dm::getRequest()->getUriPrefix();
+     
+    if (strpos($href, $uriPrefix) !== 0)
+    {
+      $href = $uriPrefix.$href;
+    }
+     
+    return $href;
+  }
+
+  protected function renderText()
+  {
+    return $this->options['text'];
+  }
+
+  protected function buildUrl($base, array $data = array())
+  {
+    return $base.'?'.http_build_query($data, null, '&');
+  }
+  
+}
\ No newline at end of file

Deleted: plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmLinkTag.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmLinkTag.php      
2010-01-24 14:51:04 UTC (rev 27128)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmLinkTag.php      
2010-01-24 15:08:33 UTC (rev 27129)
@@ -1,220 +0,0 @@
-<?php
-
-abstract class dmBaseLinkTag extends dmHtmlTag
-{
-  protected
-  $resource,
-  $requestContext;
-  
-  protected function initialize(array $options = array())
-  {
-    parent::initialize($options);
-    
-    $this->addAttributeToRemove(array('text', 'current_class', 'parent_class', 
'current_span'));
-    
-    $this->addEmptyAttributeToRemove(array('target', 'title'));
-    
-    $this->addClass('link');
-  }
-
-  public function getDefaultOptions()
-  {
-    return array_merge(parent::getDefaultOptions(), array(
-      'current_class' => 'dm_current',
-      'parent_class'  => 'dm_parent',
-      'current_span'  => false
-    ));
-  }
-
-  public function isCurrent()
-  {
-    return false;
-  }
-
-  public function isParent()
-  {
-    return false;
-  }
-  
-  /*
-   * @return string baseHref the href without query string
-   */
-  abstract protected function getBaseHref();
-  
-  public function getHrefPrefix()
-  {
-    return sfConfig::get('sf_no_script_name') ? 
$this->requestContext['prefix'] : $this->requestContext['script_name'];
-  }
-  
-  /*
-   * Set text
-   * @return dmLinkTag $this
-   */
-  public function text($v)
-  {
-    return $this->setOption('text', (string) $v);
-  }
-
-  /*
-   * Set title
-   * @return dmLinkTag $this
-   */
-  public function title($v)
-  {
-    return $this->setOption('title', (string) $v);
-  }
-
-  /*
-   * Set text and title
-   * @return dmLinkTag $this
-   */
-  public function textTitle($v)
-  {
-    return $this->text($v)->title($v);
-  }
-
-  /*
-   * Set link target
-   * @return dmLinkTag $this
-   */
-  public function target($v)
-  {
-    if (in_array($v, array('blank', 'parent', 'self', 'top')))
-    {
-      $v = '_'.$v;
-    }
-
-    return $this->setOption('target', strtolower($v));
-  }
-
-  /*
-   * Add an anchor
-   * @return dmLinkTag $this
-   */
-  public function anchor($v)
-  {
-    return $this->setOption('anchor', trim((string) $v, '#'));
-  }
-
-  /*
-   * Add a request parameter
-   * @return dmLinkTag $this
-   */
-  public function param($key, $value)
-  {
-    return $this->params(array($key => $value));
-  }
-
-  /*
-   * Add request parameters
-   * @return dmLinkTag $this
-   */
-  public function params(array $params)
-  {
-    foreach($params as $key => $value)
-    {
-      $params[$key] = $value;
-    }
-
-    return $this->setOption('params', array_merge($this->get('params', 
array()), $params));
-  }
-
-  /*
-   * Whether to display current links with span tag
-   * @return dmLinkTag $this
-   */
-  public function currentSpan($bool)
-  {
-    return $this->setOption('current_span', (bool) $bool);
-  }
-
-  /*
-   * Sets the current css class
-   * @return dmLinkTag $this
-   */
-  public function currentClass($class)
-  {
-    return $this->setOption('current_class', (string) $class);
-  }
-
-  /*
-   * Sets the parent css class
-   * @return dmLinkTag $this
-   */
-  public function parentClass($class)
-  {
-    return $this->setOption('parent_class', (string) $class);
-  }
-
-  public function render()
-  {
-    return '<a'.$this->getHtmlAttributes().'>'.$this->renderText().'</a>';
-  }
-
-  protected function prepareAttributesForHtml(array $attributes)
-  {
-    $attributes = parent::prepareAttributesForHtml($attributes);
-
-    $attributes['href'] = $this->getBaseHref();
-
-    if (array_key_exists('params', $attributes))
-    {
-      if (!empty($attributes['params']))
-      {
-        $attributes['href'] = $this->buildUrl(
-        dmString::getBaseFromUrl($attributes['href']),
-        array_merge(dmString::getDataFromUrl($attributes['href']), 
$attributes['params'])
-        );
-      }
-      
-      unset($attributes['params']);
-    }
-    
-    if (isset($attributes['anchor']))
-    {
-      $attributes['href'] .= '#'.$attributes['anchor'];
-      
-      unset($attributes['anchor']);
-    }
-
-    // makes unit testing easier
-    ksort($attributes);
-    
-    return $attributes;
-  }
-
-  public function getHref()
-  {
-    return dmArray::get($this->prepareAttributesForHtml($this->options), 
'href');
-  }
-  
-  public function getText()
-  {
-    return $this->renderText();
-  }
-
-  public function getAbsoluteHref()
-  {
-    $href = $this->getHref();
-    
-    $uriPrefix = dm::getRequest()->getUriPrefix();
-     
-    if (strpos($href, $uriPrefix) !== 0)
-    {
-      $href = $uriPrefix.$href;
-    }
-     
-    return $href;
-  }
-
-  protected function renderText()
-  {
-    return $this->options['text'];
-  }
-
-  protected function buildUrl($base, array $data = array())
-  {
-    return $base.'?'.http_build_query($data, null, '&');
-  }
-  
-}
\ No newline at end of file

Modified: plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmFrontLinkTagTest.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmFrontLinkTagTest.php      
2010-01-24 14:51:04 UTC (rev 27128)
+++ plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmFrontLinkTagTest.php      
2010-01-24 15:08:33 UTC (rev 27129)
@@ -4,7 +4,7 @@
 $helper = new dmUnitTestHelper();
 $helper->boot('front');
 
-$t = new lime_test(35);
+$t = new lime_test(39);
 
 sfConfig::set('sf_no_script_name', false);
 
@@ -128,11 +128,11 @@
 
 $t->diag('blank');
 
-$blankLink = sprintf('<a class="link" href="%s" target="%s">%s</a>', 
'http://iliaz.com', '_blank', 'http://iliaz.com');
-$t->is((string)£link('http://iliaz.com')->target('blank'), $blankLink, 'blank 
link is '.$blankLink);
+$blankLink = sprintf('<a class="link" href="%s" target="%s">%s</a>', 
'http://diem-project.org', '_blank', 'http://diem-project.org');
+$t->is((string)£link('http://diem-project.org')->target('blank'), $blankLink, 
'blank link is '.$blankLink);
 
-$blankLink = sprintf('<a class="link" href="%s">%s</a>', 'http://iliaz.com', 
'http://iliaz.com');
-$t->is((string)£link('http://iliaz.com')->target('blank')->target(false), 
$blankLink, 'canceled blank link is '.$blankLink);
+$blankLink = sprintf('<a class="link" href="%s">%s</a>', 
'http://diem-project.org', 'http://diem-project.org');
+$t->is((string)£link('http://diem-project.org')->target('blank')->target(false),
 $blankLink, 'canceled blank link is '.$blankLink);
 
 $t->diag('media links');
 dmDb::table('DmMediaFolder')->checkRoot();
@@ -171,4 +171,31 @@
 
 $media->delete();
 
-$t->is((string)£link('mailto:[email protected]')->text('email'), $html = '<a 
class="link" href="mailto:[email protected]";>email</a>', 'mailto: '.$html);
\ No newline at end of file
+$t->is((string)£link('mailto:[email protected]')->text('email'), $html = '<a 
class="link" href="mailto:[email protected]";>email</a>', 'mailto: '.$html);
+
+$t->comment('Test use_beaf');
+$helper->getServiceContainer()->mergeParameter('link_tag_uri.options', 
array('use_beaf' => true));
+
+$expected = sprintf(
+  '<a class="link beafh" href="%s"><span class="beafore"></span><span 
class="beafin">%s</span><span class="beafter"></span></span></a>',
+  'http://diem-project.org', 'http://diem-project.org'
+);
+$t->is((string)£link('http://diem-project.org')->set('.beafh'), $expected, 
'beafh link is '.$expected);
+
+$expected = sprintf(
+  '<a class="link beafv" href="%s"><span class="beafore"></span><span 
class="beafin">%s</span><span class="beafter"></span></span></a>',
+  'http://diem-project.org', 'http://diem-project.org'
+);
+$t->is((string)£link('http://diem-project.org')->set('.beafv'), $expected, 
'beafh link is '.$expected);
+
+$expected = sprintf(
+  '<a class="link beafh myclass" href="%s"><span class="beafore"></span><span 
class="beafin">%s</span><span class="beafter"></span></span></a>',
+  'http://diem-project.org', 'http://diem-project.org'
+);
+$t->is((string)£link('http://diem-project.org')->set('.beafh.myclass'), 
$expected, 'beafh link is '.$expected);
+
+$expected = sprintf(
+  '<a class="link beafv myclass" href="%s"><span class="beafore"></span><span 
class="beafin">%s</span><span class="beafter"></span></span></a>',
+  'http://diem-project.org', 'http://diem-project.org'
+);
+$t->is((string)£link('http://diem-project.org')->set('.beafv.myclass'), 
$expected, 'beafh link is '.$expected);
\ No newline at end of file

Modified: plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmHelperTest.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmHelperTest.php    
2010-01-24 14:51:04 UTC (rev 27128)
+++ plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmHelperTest.php    
2010-01-24 15:08:33 UTC (rev 27129)
@@ -4,7 +4,7 @@
 $helper = new dmUnitTestHelper();
 $helper->boot('front');
 
-$t = new lime_test(29);
+$t = new lime_test(35);
 
 dm::loadHelpers(array('Dm', 'I18N'));
 
@@ -88,4 +88,25 @@
 $t->is(£table()->head('Header 1', 'Header 2')->body('Value 1', 'Value 
2')->body('Value 3', 'Value 4')->render(), $table, $table);
 
 $ctrlFullPath = dmOs::join(sfConfig::get('sf_web_dir'), 
'dm/core/js/dmCoreCtrl.js');
-$t->is($helper->get('helper')->getJavascriptFullPath('core.ctrl'), 
$ctrlFullPath, 'core ctrl is in '.$ctrlFullPath);
\ No newline at end of file
+$t->is($helper->get('helper')->getJavascriptFullPath('core.ctrl'), 
$ctrlFullPath, 'core ctrl is in '.$ctrlFullPath);
+
+$t->comment('Test use_beaf');
+$helper->get('helper')->setOption('use_beaf', true);
+
+$expected = '<div class="beafh clearfix"><div class="beafore"></div><div 
class="beafin">test</div><div class="beafter"></div></div>';
+$t->is($helper->get('helper')->£('div.beafh', 'test'), $expected, $expected);
+
+$expected = '<div class="beafv clearfix"><div class="beafore"></div><div 
class="beafin">test</div><div class="beafter"></div></div>';
+$t->is($helper->get('helper')->£('div.beafv', 'test'), $expected, $expected);
+
+$expected = '<div class="beafh myclass clearfix"><div 
class="beafore"></div><div class="beafin">test</div><div 
class="beafter"></div></div>';
+$t->is($helper->get('helper')->£('div.beafh.myclass', 'test'), $expected, 
$expected);
+
+$expected = '<div class="beafv myclass clearfix"><div 
class="beafore"></div><div class="beafin">test</div><div 
class="beafter"></div></div>';
+$t->is($helper->get('helper')->£('div.beafv.myclass', 'test'), $expected, 
$expected);
+
+$expected = '<p class="beafh clearfix"><span class="beafore"></span><span 
class="beafin">test</span><span class="beafter"></span></p>';
+$t->is($helper->get('helper')->£('p.beafh', 'test'), $expected, $expected);
+
+$expected = '<p class="beafv clearfix"><span class="beafore"></span><span 
class="beafin">test</span><span class="beafter"></span></p>';
+$t->is($helper->get('helper')->£('p.beafv', 'test'), $expected, $expected);
\ No newline at end of file

Modified: plugins/diemPlugin/trunk/dmFrontPlugin/config/dm/services.yml
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/config/dm/services.yml       
2010-01-24 14:51:04 UTC (rev 27128)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/config/dm/services.yml       
2010-01-24 15:08:33 UTC (rev 27129)
@@ -91,7 +91,7 @@
   link_tag_record:
     class:                    %link_tag_record.class%
     shared:                   false
-    arguments:                [ %link_tag.resource%, %request.context%, 
%context.page%, @user, %link_tag_page.options% ]
+    arguments:                [ %link_tag.resource%, %request.context%, 
%context.page%, @user, %link_tag_record.options% ]
 
   link_tag_page:
     class:                    %link_tag_page.class%

Modified: 
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/link/tag/dmFrontLinkTagPage.php
===================================================================
--- 
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/link/tag/dmFrontLinkTagPage.php
        2010-01-24 14:51:04 UTC (rev 27128)
+++ 
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/link/tag/dmFrontLinkTagPage.php
        2010-01-24 15:08:33 UTC (rev 27129)
@@ -96,8 +96,8 @@
     {
       unset($preparedAttributes['title']);
     }
-    
-    return 
'<'.$tagName.$this->convertAttributesToHtml($preparedAttributes).'>'.$text.'</'.$tagName.'>';
+
+    return $this->doRender($tagName, 
$this->convertAttributesToHtml($preparedAttributes), $text);
   }
   
   protected function prepareAttributesForHtml(array $attributes)

-- 
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.

Reply via email to