Move Template::layout() to LayoutHelper

This commit is contained in:
Frederic Guillot
2016-03-04 20:26:52 -05:00
parent 8f3e2b2e5c
commit 3808209690
2 changed files with 20 additions and 20 deletions

View File

@@ -69,23 +69,6 @@ class Template
return ob_get_clean(); return ob_get_clean();
} }
/**
* Render a page layout
*
* @access public
* @param string $template_name Template name
* @param array $template_args Key/value map
* @param string $layout_name Layout name
* @return string
*/
public function layout($template_name, array $template_args = array(), $layout_name = 'layout')
{
return $this->render(
$layout_name,
$template_args + array('content_for_layout' => $this->render($template_name, $template_args))
);
}
/** /**
* Define a new template override * Define a new template override
* *

View File

@@ -5,7 +5,7 @@ namespace Kanboard\Helper;
use Kanboard\Core\Base; use Kanboard\Core\Base;
/** /**
* Layout helpers * Layout Helper
* *
* @package helper * @package helper
* @author Frederic Guillot * @author Frederic Guillot
@@ -30,7 +30,7 @@ class LayoutHelper extends Base
$params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()); $params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId());
} }
return $this->template->layout($template, $params); return $this->pageLayout($template, $params);
} }
/** /**
@@ -146,7 +146,24 @@ class LayoutHelper extends Base
} }
/** /**
* Common method to generate a sublayout * Render page layout
*
* @access public
* @param string $template Template name
* @param array $params Key/value dictionary
* @param string $layout Layout name
* @return string
*/
public function pageLayout($template, array $params = array(), $layout = 'layout')
{
return $this->template->render(
$layout,
$params + array('content_for_layout' => $this->template->render($template, $params))
);
}
/**
* Common method to generate a sub-layout
* *
* @access public * @access public
* @param string $sublayout * @param string $sublayout