Move Template::layout() to LayoutHelper

2 files changed, 20 insertions, 20 deletions

diff --git a/app/Core/Template.php b/app/Core/Template.php
index fa7b65ec..f85c7f28 100644
--- a/app/Core/Template.php
+++ b/app/Core/Template.php
@@ -70,23 +70,6 @@ class Template
     }
 
     /**
-     * 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
      *
      * @access public
diff --git a/app/Helper/LayoutHelper.php b/app/Helper/LayoutHelper.php
index 064c11ac..dc90b7f3 100644
--- a/app/Helper/LayoutHelper.php
+++ b/app/Helper/LayoutHelper.php
@@ -5,7 +5,7 @@ namespace Kanboard\Helper;
 use Kanboard\Core\Base;
 
 /**
- * Layout helpers
+ * Layout Helper
  *
  * @package helper
  * @author  Frederic Guillot
@@ -30,7 +30,7 @@ class LayoutHelper extends Base
             $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
      * @param  string $sublayout