Merge pull request #28 from SahAssar/namespace-twig

Add twig namespacing
bolt · Feb 22, 2017 · 420b65d · 420b65d
2 parents 36563fb + 3d6906a
commit 420b65d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/Action/StatisticsAction.php b/src/Action/StatisticsAction.php
@@ -61,6 +61,6 @@ public function displayStatistics(Request $request)
             'webpath' => $this->webPath,
         ];
 
-        return $this->view->render("base.twig", $data);
+        return $this->view->render("@GoogleAnalytics/base.twig", $data);
     }
 }
diff --git a/src/GoogleAnalyticsExtension.php b/src/GoogleAnalyticsExtension.php
@@ -111,14 +111,16 @@ public function widget()
         ];
 
         // Render the template, and return the results
-        return $this->renderTemplate('widget.twig', $twigvars);
+        return $this->renderTemplate('@GoogleAnalytics/widget.twig', $twigvars);
     }
 
     /**
      * @return array
      */
     protected function registerTwigPaths()
     {
-        return ['templates'];
+        return [
+            'templates' => ['namespace' => 'GoogleAnalytics']
+        ];
     }
 }
diff --git a/src/Snippet/AnalyticsSnippet.php b/src/Snippet/AnalyticsSnippet.php
@@ -48,12 +48,12 @@ public function insertAnalytics()
         //Check to see if universal is set
         if ($this->config->isUniversal()) {
             $data['domainname'] = $this->config->getUniversalDomainname();
-            return $this->view->render("universal.twig", $data);
+            return $this->view->render("@GoogleAnalytics/universal.twig", $data);
         }
 
         //Get full url for the current website
         $data['domainname'] = $this->request->getCurrentRequest()->server->get('HTTP_HOST');
 
-        return $this->view->render("normal.twig", $data);
+        return $this->view->render("@GoogleAnalytics/normal.twig", $data);
     }
 }