Changeset 6005

Timestamp:

02/05/12 16:39:25 (4 months ago)

Author:

vain

Message:

• serveral changes, so that setting a template manually via setTemplate() works again
• main methods get|setTemplate are now inside the view_mapper
• calls at the controller/modulecontroller level are proxied there
• Clansuite_View_Mapper is now an object inside the Renderer_Base class

Location:

trunk/core

Files:

• modulecontroller.core.php (modified) (4 diffs)
• renderer/renderer.base.php (modified) (6 diffs)
• renderer/templatemapper.php (modified) (1 diff)

trunk/core/modulecontroller.core.php

@@ -302 +302 @@
      * Get view returns the render engine
      *
-     * @param string $renderEngineName Sets the render engine, like smarty, phptal.
+     * @param string $renderEngineName Name of the render engine, like smarty, phptal.
      * @return Returns the View Object (Rendering Engine)
      */
@@ -314 +314 @@
 
         # if already set, get the rendering engine from the view variable
-        if (isset($this->view) === true)
+        if(isset($this->view) === true)
         {
             return $this->view;
@@ -411 +411 @@
     public function display($templates = null)
     {
-        $view_mapper = new Clansuite_View_Mapper;
+        # get the view
+        $this->view = $this->getView();
+
+        # get the view mapper
+        $view_mapper = $this->view->getViewMapper();
 
         # set layout and content template by parameter array
@@ -432 +436 @@
         # get the templatename
         $template = $view_mapper->getTemplateName();
-
-        # get the view
-        $this->view = $this->getView();
 
         # Debug display of Layout Template and Content Template

trunk/core/renderer/renderer.base.php

@@ -53 +53 @@
 
     /**
-     * @var Object Holds instance of the Theme Object
+     * @var object Holds instance of the Theme Object
      */
     public $theme = null;
@@ -63 +63 @@
 
     /**
-     * @var string The "content" template
-     */
-    public $template = null;
-
-    /**
      * @var string Variable for the RenderMode (available: WRAPPED)
      */
@@ -83 +78 @@
 
     /**
+     * @var object Clansuite_View_Mapper
+     */
+    public $view_mapper = null;
+
+    /**
      * Construct Renderer
      *
@@ -89 +89 @@
     public function __construct(Clansuite_Config $config)
     {
-        $this->config   = $config;
+        $this->config = $config;
+        $this->view_mapper = new Clansuite_View_Mapper();
     }
 
@@ -164 +165 @@
     abstract public function clearCache();
 
-    /**
-     * Set the template name
+    public function getViewMapper()
+    {
+        return $this->view_mapper;
+    }
+
+    public function setViewMapper(Clansuite_View_Mapper $view_mapper)
+    {
+        $this->view_mapper = $view_mapper;
+    }
+
+    /**
+     * Set the template name.
+     *
+     * Proxies to Clansuite_View_Mapper::setTemplate()
      *
      * @param string $template Name of the Template (full path)
@@ -171 +184 @@
     public function setTemplate($template)
     {
-        $this->template = $template;
+        $this->getViewMapper()->setTemplate($template);
     }
 
     /**
      * Get the template name
+     *
+     * Proxies to Clansuite_View_Mapper::getTemplate()
+     *
+     * @return string $template Name of the Template (full path)
      */
     public function getTemplate()
     {
-        return $this->template;
+        return $this->getViewMapper()->getTemplate();
     }
 

trunk/core/renderer/templatemapper.php

@@ -109 +109 @@
 
     /**
+     * Get the template name
+     *
+     * Proxies to Clansuite_View_Mapper::getTemplate()
+     *
+     * @return string $template Name of the Template (full path)
+     */
+    public function getTemplate()
+    {
+        return $this->template;
+    }
+
+    /**
      * Returns the Template Path
      *