From 26492aba7ee2bfb8c525ea0aaa580aff47a414ba Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 31 Jan 2016 21:44:49 -0500
Subject: Simplify layout and templates generation

---
 app/Controller/Link.php | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'app/Controller/Link.php')

diff --git a/app/Controller/Link.php b/app/Controller/Link.php
index d52d1f91..ec7ab1af 100644
--- a/app/Controller/Link.php
+++ b/app/Controller/Link.php
@@ -11,22 +11,6 @@ namespace Kanboard\Controller;
  */
 class Link extends Base
 {
-    /**
-     * Common layout for config views
-     *
-     * @access private
-     * @param  string    $template   Template name
-     * @param  array     $params     Template parameters
-     * @return string
-     */
-    private function layout($template, array $params)
-    {
-        $params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId());
-        $params['config_content_for_layout'] = $this->template->render($template, $params);
-
-        return $this->template->layout('config/layout', $params);
-    }
-
     /**
      * Get the current link
      *
@@ -51,7 +35,7 @@ class Link extends Base
      */
     public function index(array $values = array(), array $errors = array())
     {
-        $this->response->html($this->layout('link/index', array(
+        $this->response->html($this->helper->layout->config('link/index', array(
             'links' => $this->link->getMergedList(),
             'values' => $values,
             'errors' => $errors,
@@ -91,7 +75,7 @@ class Link extends Base
         $link = $this->getLink();
         $link['label'] = t($link['label']);
 
-        $this->response->html($this->layout('link/edit', array(
+        $this->response->html($this->helper->layout->config('link/edit', array(
             'values' => $values ?: $link,
             'errors' => $errors,
             'labels' => $this->link->getList($link['id']),
@@ -131,7 +115,7 @@ class Link extends Base
     {
         $link = $this->getLink();
 
-        $this->response->html($this->layout('link/remove', array(
+        $this->response->html($this->helper->layout->config('link/remove', array(
             'link' => $link,
             'title' => t('Remove a link')
         )));
-- 
cgit v1.2.3