Rework template calls for module

classes/Smarty/TemplateFinder.php

@@ -49,7 +49,7 @@ public function getTemplate($template, $entity, $id, $locale)
     {
         $locale = (Validate::isLocale($locale)) ? $locale : '';
 
-        $templates = $this->getTemplateHierarchy($template, $entity, $id, $locale);
+        $templates = $this->getTemplateHierarchy($template, $entity, $id);
 
         foreach ($this->directories as $dir) {
             foreach ($templates as $tpl) {

classes/controller/Controller.php

@@ -541,13 +541,6 @@ protected function smartyOutputContent($content)
             $html = $this->context->smarty->fetch($content, null, $this->getLayout());
         }
 
-        if ($this->controller_type === 'modulefront') {
-            // Modules do not know about the layout system,
-            // let's inject their output inside the front-end layout.
-            $this->context->smarty->assign('content', $html);
-            $html = $this->context->smarty->fetch('wrapper.tpl');
-        }
-
         $html = trim($html);
 
         if (in_array($this->controller_type, array('front', 'modulefront')) && !empty($html) && $this->getLayout()) {

classes/controller/ModuleFrontController.php

@@ -55,31 +55,11 @@ public function __construct()
      */
     public function setTemplate($template, $params = array(), $locale = null)
     {
-        if (!$path = $this->getTemplatePath($template)) {
-            throw new PrestaShopException("Template '$template' not found");
-        }
-
-        $this->template = $path;
-    }
-
-    /**
-     * Finds and returns module front template that take the highest precedence.
-     *
-     * @param string $template Template filename
-     *
-     * @return string|false
-     */
-    public function getTemplatePath($template)
-    {
-        if (Tools::file_exists_cache(_PS_THEME_DIR_.'modules/'.$this->module->name.'/'.$template)) {
-            return _PS_THEME_DIR_.'modules/'.$this->module->name.'/'.$template;
-        } elseif (Tools::file_exists_cache(_PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/front/'.$template)) {
-            return _PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/front/'.$template;
-        } elseif (Tools::file_exists_cache(_PS_MODULE_DIR_.$this->module->name.'/views/templates/front/'.$template)) {
-            return _PS_MODULE_DIR_.$this->module->name.'/views/templates/front/'.$template;
+        if (strpos($template, 'module:') === 0) {
+            $this->template = $template;
+        } else {
+            parent::setTemplate($template, $params, $locale);
         }
-
-        return false;
     }
 
     public function initContent()

classes/module/Module.php

@@ -2213,6 +2213,35 @@ public function display($file, $template, $cache_id = null, $compile_id = null)
         }
     }
 
+    /**
+     * Use this method to return the result of a smarty template when assign data only locally with $this->smarty->assign()
+     *
+     * @param string $templatePath relative path the template file, from the module root dir.
+     * @param null $cache_id
+     * @param null $compile_id
+     *
+     * @return mixed
+     */
+    public function fetch($templatePath, $cache_id = null, $compile_id = null)
+    {
+        if ($cache_id !== null) {
+            Tools::enableCache();
+        }
+
+        $template = $this->context->smarty->createTemplate(
+            $templatePath,
+            $cache_id,
+            $compile_id,
+            $this->smarty
+        );
+
+        if ($cache_id !== null) {
+            Tools::restoreCacheSettings();
+        }
+
+        return $template->fetch();
+    }
+
     /**
      * @param string $template
      * @param string|null $cache_id
@@ -2229,6 +2258,7 @@ protected function getCurrentSubTemplate($template, $cache_id = null, $compile_i
                 $this->smarty
             );
         }
+
         return $this->current_subtemplate[$template.'_'.$cache_id.'_'.$compile_id];
     }
 
@@ -2264,11 +2294,6 @@ public function getTemplatePath($template)
         }
     }
 
-    protected function _getApplicableTemplateDir($template)
-    {
-        return $this->_isTemplateOverloaded($template) ? _PS_THEME_DIR_ : _PS_MODULE_DIR_.$this->name.'/';
-    }
-
     public function isCached($template, $cache_id = null, $compile_id = null)
     {
         Tools::enableCache();

themes/classic/templates/index.tpl

@@ -1,5 +1,12 @@
 {extends file='page.tpl'}
 
-{block name='page_content'}
-    {$HOOK_HOME nofilter}
+    {block name='page_content_container'}
+      <section id="content" class="page-home">
+        {block name='page_content_top'}{/block}
+        {block name='page_content'}
+          {$HOOK_HOME nofilter}
+        {/block}
+      </section>
+    {/block}
+
 {/block}

themes/classic/templates/page.tpl

@@ -13,7 +13,7 @@
     {/block}
 
     {block name='page_content_container'}
-      <section id="content" class="page-content">
+      <section id="content" class="page-content card card-block">
         {block name='page_content_top'}{/block}
         {block name='page_content'}
           <!-- Page content -->