Merge pull request #2624 from acrobat/fix-incorrect-template-path

[AllBundles] Fixed remaining template path using the old notation
Kunstmaan · Jan 23, 2020 · 6a9cadc · 6a9cadc
2 parents c2e6bf2 + 68041d7
commit 6a9cadc
Show file tree

Hide file tree

Showing 60 changed files with 78 additions and 78 deletions.
diff --git a/src/Kunstmaan/ArticleBundle/AdminList/AbstractArticlePageAdminListConfigurator.php b/src/Kunstmaan/ArticleBundle/AdminList/AbstractArticlePageAdminListConfigurator.php
@@ -179,7 +179,7 @@ public function getOverviewPages()
      */
     public function getListTemplate()
     {
-        return 'KunstmaanArticleBundle:AbstractArticlePageAdminList:list.html.twig';
+        return '@KunstmaanArticle/AbstractArticlePageAdminList/list.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/ArticleBundle/Entity/AbstractArticleOverviewPage.php b/src/Kunstmaan/ArticleBundle/Entity/AbstractArticleOverviewPage.php
@@ -43,7 +43,7 @@ abstract public function getArticleRepository($em);
      */
     public function getDefaultView()
     {
-        return 'KunstmaanArticleBundle:AbstractArticleOverviewPage:view.html.twig';
+        return '@KunstmaanArticle/AbstractArticleOverviewPage/view.html.twig';
     }
 
     public function getControllerAction()

diff --git a/...tmaan/ArticleBundle/Tests/unit/AdminList/AbstractArticlePageAdminListConfiguratorTest.php b/...tmaan/ArticleBundle/Tests/unit/AdminList/AbstractArticlePageAdminListConfiguratorTest.php
@@ -78,7 +78,7 @@ public function testGetters()
     {
         $this->assertEquals('KunstmaanArticleBundle', $this->object->getBundleName());
         $this->assertEquals('AbstractArticlePage', $this->object->getEntityName());
-        $this->assertEquals('KunstmaanArticleBundle:AbstractArticlePageAdminList:list.html.twig', $this->object->getListTemplate());
+        $this->assertEquals('@KunstmaanArticle/AbstractArticlePageAdminList/list.html.twig', $this->object->getListTemplate());
         $this->assertEquals('KunstmaanArticleBundle:AbstractArticlePage', $this->object->getRepositoryName());
     }
 

diff --git a/src/Kunstmaan/ArticleBundle/Tests/unit/Entity/AbstractArticleOverviewPageTest.php b/src/Kunstmaan/ArticleBundle/Tests/unit/Entity/AbstractArticleOverviewPageTest.php
@@ -22,7 +22,7 @@ public function testGettersAndSetters()
     {
         $entity = new ArticleOverViewPage();
         $this->assertEquals('KunstmaanArticleBundle:AbstractArticleOverviewPage:service', $entity->getControllerAction());
-        $this->assertEquals('KunstmaanArticleBundle:AbstractArticleOverviewPage:view.html.twig', $entity->getDefaultView());
+        $this->assertEquals('@KunstmaanArticle/AbstractArticleOverviewPage/view.html.twig', $entity->getDefaultView());
         $this->assertInternalType('array', $entity->getPossibleChildTypes());
         $this->assertInternalType('array', $entity->getPagePartAdminConfigurations());
     }

diff --git a/src/Kunstmaan/DashboardBundle/Controller/DashboardController.php b/src/Kunstmaan/DashboardBundle/Controller/DashboardController.php
@@ -27,6 +27,6 @@ public function indexAction(Request $request)
         $widgets = $widgetManager->getWidgets();
         $segmentId = $request->query->get('segment');
 
-        return $this->render('KunstmaanDashboardBundle:Dashboard:index.html.twig', array('widgets' => $widgets, 'id' => $segmentId));
+        return $this->render('@KunstmaanDashboard/Dashboard/index.html.twig', array('widgets' => $widgets, 'id' => $segmentId));
     }
 }
diff --git a/src/Kunstmaan/DashboardBundle/Controller/GoogleAnalyticsController.php b/src/Kunstmaan/DashboardBundle/Controller/GoogleAnalyticsController.php
@@ -33,7 +33,7 @@ public function widgetAction(Request $request)
                 $params['authUrl'] = $configHelper->getAuthUrl();
             }
 
-            return $this->render('KunstmaanDashboardBundle:GoogleAnalytics:connect.html.twig', $params);
+            return $this->render('@KunstmaanDashboard/GoogleAnalytics/connect.html.twig', $params);
         }
 
         // if propertyId not set
@@ -153,7 +153,7 @@ public function configAction(Request $request)
         $params['profileSegments'] = $configHelper->getProfileSegments();
 
         return $this->render(
-            'KunstmaanDashboardBundle:GoogleAnalytics:setupcontainer.html.twig',
+            '@KunstmaanDashboard/GoogleAnalytics/setupcontainer.html.twig',
             $params
         );
     }

diff --git a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/FileFormSubmissionField.php b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/FileFormSubmissionField.php
@@ -219,7 +219,7 @@ public function getUrl()
      */
     public function getSubmissionTemplate()
     {
-        return 'KunstmaanFormBundle:FileUploadPagePart:submission.html.twig';
+        return '@KunstmaanForm/FileUploadPagePart/submission.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/AbstractFormPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/AbstractFormPagePart.php
@@ -62,6 +62,6 @@ public function getLabel()
      */
     public function getAdminView()
     {
-        return 'KunstmaanFormBundle:AbstractFormPagePart:admin-view.html.twig';
+        return '@KunstmaanForm/AbstractFormPagePart/admin-view.html.twig';
     }
 }
diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/CheckboxPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/CheckboxPagePart.php
@@ -87,7 +87,7 @@ public function getErrorMessageRequired()
      */
     public function getDefaultView()
     {
-        return 'KunstmaanFormBundle:CheckboxPagePart:view.html.twig';
+        return '@KunstmaanForm/CheckboxPagePart/view.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/ChoicePagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/ChoicePagePart.php
@@ -73,7 +73,7 @@ class ChoicePagePart extends AbstractFormPagePart
      */
     public function getDefaultView()
     {
-        return 'KunstmaanFormBundle:ChoicePagePart:view.html.twig';
+        return '@KunstmaanForm/ChoicePagePart/view.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/EmailPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/EmailPagePart.php
@@ -119,7 +119,7 @@ public function getErrorMessageInvalid()
      */
     public function getDefaultView()
     {
-        return 'KunstmaanFormBundle:EmailPagePart:view.html.twig';
+        return '@KunstmaanForm/EmailPagePart/view.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/FileUploadPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/FileUploadPagePart.php
@@ -128,7 +128,7 @@ public function getErrorMessageRequired()
      */
     public function getDefaultView()
     {
-        return 'KunstmaanFormBundle:FileUploadPagePart:view.html.twig';
+        return '@KunstmaanForm/FileUploadPagePart/view.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/MultiLineTextPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/MultiLineTextPagePart.php
@@ -102,7 +102,7 @@ public function getErrorMessageRegex()
      */
     public function getDefaultView()
     {
-        return 'KunstmaanFormBundle:MultiLineTextPagePart:view.html.twig';
+        return '@KunstmaanForm/MultiLineTextPagePart/view.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/SingleLineTextPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/SingleLineTextPagePart.php
@@ -150,7 +150,7 @@ public function getErrorMessageRegex()
      */
     public function getDefaultView()
     {
-        return 'KunstmaanFormBundle:SingleLineTextPagePart:view.html.twig';
+        return '@KunstmaanForm/SingleLineTextPagePart/view.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/SubmitButtonPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/SubmitButtonPagePart.php
@@ -62,7 +62,7 @@ public function __toString()
      */
     public function getDefaultView()
     {
-        return 'KunstmaanFormBundle:SubmitButtonPagePart:view.html.twig';
+        return '@KunstmaanForm/SubmitButtonPagePart/view.html.twig';
     }
 
     /**
@@ -72,7 +72,7 @@ public function getDefaultView()
      */
     public function getAdminView()
     {
-        return 'KunstmaanFormBundle:SubmitButtonPagePart:view-admin.html.twig';
+        return '@KunstmaanForm/SubmitButtonPagePart/view-admin.html.twig';
     }
 
     /**

diff --git a/...orBundle/skeleton/defaultsite/app/KunstmaanSitemapBundle/views/SitemapPage/view.html.twig b/...orBundle/skeleton/defaultsite/app/KunstmaanSitemapBundle/views/SitemapPage/view.html.twig
@@ -7,7 +7,7 @@
             {% if nodemenu is defined %}
                 {% for topNode in nodemenu.getTopNodes() %}
                     {% for node in topNode.getChildren() %}
-                        {% include 'KunstmaanSitemapBundle:SitemapPage:entry.html.twig' with {'entry' : node} %}
+                        {% include '@KunstmaanSitemap/SitemapPage/entry.html.twig' with {'entry' : node} %}
                     {% endfor %}
                 {% endfor %}
             {% endif %}

diff --git a/...oGeneratorBundle/skeleton/pagepart/Resources/views/PageParts/AudioPagePart/view.html.twig b/...oGeneratorBundle/skeleton/pagepart/Resources/views/PageParts/AudioPagePart/view.html.twig
@@ -1,3 +1,3 @@
 {% if resource.media is defined and resource.media != "" %}
-    {% include 'KunstmaanMediaBundle:Media\\RemoteAudio:preview.html.twig' with {'media': resource.media} %}
+    {% include '@KunstmaanMedia/Media/RemoteAudio/preview.html.twig' with {'media': resource.media} %}
 {% endif %}
diff --git a/src/Kunstmaan/LeadGenerationBundle/AdminList/PopupAdminListConfigurator.php b/src/Kunstmaan/LeadGenerationBundle/AdminList/PopupAdminListConfigurator.php
@@ -17,9 +17,9 @@ public function __construct(EntityManager $em, AclHelper $aclHelper = null)
     {
         parent::__construct($em, $aclHelper);
 
-        $this->setListTemplate('KunstmaanLeadGenerationBundle:AdminList:popup-list.html.twig');
-        $this->setEditTemplate('KunstmaanLeadGenerationBundle:AdminList:popup-edit.html.twig');
-        $this->setAddTemplate('KunstmaanLeadGenerationBundle:AdminList:popup-edit.html.twig');
+        $this->setListTemplate('@KunstmaanLeadGeneration/AdminList/popup-list.html.twig');
+        $this->setEditTemplate('@KunstmaanLeadGeneration/AdminList/popup-edit.html.twig');
+        $this->setAddTemplate('@KunstmaanLeadGeneration/AdminList/popup-edit.html.twig');
     }
 
     /**

diff --git a/src/Kunstmaan/LeadGenerationBundle/AdminList/RulesAdminListConfigurator.php b/src/Kunstmaan/LeadGenerationBundle/AdminList/RulesAdminListConfigurator.php
@@ -26,9 +26,9 @@ public function __construct(EntityManager $em, AclHelper $aclHelper = null, $id)
         parent::__construct($em, $aclHelper);
 
         $this->setPopupId($id);
-        $this->setListTemplate('KunstmaanLeadGenerationBundle:AdminList:rules-list.html.twig');
-        $this->setEditTemplate('KunstmaanLeadGenerationBundle:AdminList:rules-edit.html.twig');
-        $this->setAddTemplate('KunstmaanLeadGenerationBundle:AdminList:rules-edit.html.twig');
+        $this->setListTemplate('@KunstmaanLeadGeneration/AdminList/rules-list.html.twig');
+        $this->setEditTemplate('@KunstmaanLeadGeneration/AdminList/rules-edit.html.twig');
+        $this->setAddTemplate('@KunstmaanLeadGeneration/AdminList/rules-edit.html.twig');
     }
 
     /**

diff --git a/src/Kunstmaan/LeadGenerationBundle/Controller/AbstractNewsletterController.php b/src/Kunstmaan/LeadGenerationBundle/Controller/AbstractNewsletterController.php
@@ -77,17 +77,17 @@ protected function getSubscriptionFormType()
 
     protected function getIndexTemplate()
     {
-        return 'KunstmaanLeadGenerationBundle:Newsletter:index.html.twig';
+        return '@KunstmaanLeadGeneration/Newsletter/index.html.twig';
     }
 
     protected function getFormTemplate()
     {
-        return 'KunstmaanLeadGenerationBundle:Newsletter:form.html.twig';
+        return '@KunstmaanLeadGeneration/Newsletter/form.html.twig';
     }
 
     protected function getThanksTemplate()
     {
-        return 'KunstmaanLeadGenerationBundle:Newsletter:thanks.html.twig';
+        return '@KunstmaanLeadGeneration/Newsletter/thanks.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/LeadGenerationBundle/Controller/AbstractRedirectController.php b/src/Kunstmaan/LeadGenerationBundle/Controller/AbstractRedirectController.php
@@ -22,6 +22,6 @@ public function indexAction($popup)
 
     protected function getIndexTemplate()
     {
-        return 'KunstmaanLeadGenerationBundle:Redirect:index.html.twig';
+        return '@KunstmaanLeadGeneration/Redirect/index.html.twig';
     }
 }
diff --git a/src/Kunstmaan/LeadGenerationBundle/Resources/views/Newsletter/index.html.twig b/src/Kunstmaan/LeadGenerationBundle/Resources/views/Newsletter/index.html.twig
@@ -9,7 +9,7 @@
 
 <div id="{{ popup.htmlId }}" class="popup--hide">
     <div id="{{ popup.htmlId }}--content">
-        {% include 'KunstmaanLeadGenerationBundle:Newsletter:form.html.twig' %}
+        {% include '@KunstmaanLeadGeneration/Newsletter/form.html.twig' %}
     </div>
 </div>
 

diff --git a/src/Kunstmaan/LeadGenerationBundle/Twig/PopupTwigExtension.php b/src/Kunstmaan/LeadGenerationBundle/Twig/PopupTwigExtension.php
@@ -74,7 +74,7 @@ public function renderJsIncludes(Environment $environment)
     {
         $files = $this->popupManager->getUniqueJsIncludes();
 
-        return $environment->render('KunstmaanLeadGenerationBundle::js-includes.html.twig', array('files' => $files));
+        return $environment->render('@KunstmaanLeadGeneration/js-includes.html.twig', array('files' => $files));
     }
 
     /**
@@ -84,7 +84,7 @@ public function renderPopupsHtml(Environment $environment)
     {
         $popups = $this->popupManager->getPopups();
 
-        return $environment->render('KunstmaanLeadGenerationBundle::popups-html.html.twig', array('popups' => $popups));
+        return $environment->render('@KunstmaanLeadGeneration/popups-html.html.twig', array('popups' => $popups));
     }
 
     /**
@@ -94,7 +94,7 @@ public function renderInitializeJs(Environment $environment)
     {
         $popups = $this->popupManager->getPopups();
 
-        return $environment->render('KunstmaanLeadGenerationBundle::initialize-js.html.twig', array('popups' => $popups, 'debug' => $this->debug));
+        return $environment->render('@KunstmaanLeadGeneration/initialize-js.html.twig', array('popups' => $popups, 'debug' => $this->debug));
     }
 
     /**

diff --git a/src/Kunstmaan/MediaPagePartBundle/Entity/AudioPagePart.php b/src/Kunstmaan/MediaPagePartBundle/Entity/AudioPagePart.php
@@ -62,7 +62,7 @@ public function __toString()
      */
     public function getDefaultView()
     {
-        return 'KunstmaanMediaPagePartBundle:AudioPagePart:view.html.twig';
+        return '@KunstmaanMediaPagePart/AudioPagePart/view.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/MediaPagePartBundle/Entity/DownloadPagePart.php b/src/Kunstmaan/MediaPagePartBundle/Entity/DownloadPagePart.php
@@ -62,7 +62,7 @@ public function __toString()
      */
     public function getDefaultView()
     {
-        return 'KunstmaanMediaPagePartBundle:DownloadPagePart:view.html.twig';
+        return '@KunstmaanMediaPagePart/DownloadPagePart/view.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/MediaPagePartBundle/Entity/ImagePagePart.php b/src/Kunstmaan/MediaPagePartBundle/Entity/ImagePagePart.php
@@ -149,7 +149,7 @@ public function __toString()
      */
     public function getDefaultView()
     {
-        return 'KunstmaanMediaPagePartBundle:ImagePagePart:view.html.twig';
+        return '@KunstmaanMediaPagePart/ImagePagePart/view.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/MediaPagePartBundle/Entity/SlidePagePart.php b/src/Kunstmaan/MediaPagePartBundle/Entity/SlidePagePart.php
@@ -62,7 +62,7 @@ public function __toString()
      */
     public function getDefaultView()
     {
-        return 'KunstmaanMediaPagePartBundle:SlidePagePart:view.html.twig';
+        return '@KunstmaanMediaPagePart/SlidePagePart/view.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/MediaPagePartBundle/Entity/VideoPagePart.php b/src/Kunstmaan/MediaPagePartBundle/Entity/VideoPagePart.php
@@ -62,7 +62,7 @@ public function __toString()
      */
     public function getDefaultView()
     {
-        return 'KunstmaanMediaPagePartBundle:VideoPagePart:view.html.twig';
+        return '@KunstmaanMediaPagePart/VideoPagePart/view.html.twig';
     }
 
     /**

diff --git a/src/Kunstmaan/MediaPagePartBundle/Tests/unit/Entity/AudioPagePartTest.php b/src/Kunstmaan/MediaPagePartBundle/Tests/unit/Entity/AudioPagePartTest.php
@@ -39,7 +39,7 @@ public function testSetGetMedia()
     public function testGetDefaultView()
     {
         $defaultView = $this->object->getDefaultView();
-        $this->assertEquals('KunstmaanMediaPagePartBundle:AudioPagePart:view.html.twig', $defaultView);
+        $this->assertEquals('@KunstmaanMediaPagePart/AudioPagePart/view.html.twig', $defaultView);
     }
 
     public function testGetDefaultAdminType()

diff --git a/src/Kunstmaan/MediaPagePartBundle/Tests/unit/Entity/DownloadPagePartTest.php b/src/Kunstmaan/MediaPagePartBundle/Tests/unit/Entity/DownloadPagePartTest.php
@@ -39,7 +39,7 @@ public function testGetSetMedia()
     public function testGetDefaultView()
     {
         $defaultView = $this->object->getDefaultView();
-        $this->assertEquals('KunstmaanMediaPagePartBundle:DownloadPagePart:view.html.twig', $defaultView);
+        $this->assertEquals('@KunstmaanMediaPagePart/DownloadPagePart/view.html.twig', $defaultView);
     }
 
     public function testGetDefaultAdminType()

diff --git a/src/Kunstmaan/MediaPagePartBundle/Tests/unit/Entity/ImagePagePartTest.php b/src/Kunstmaan/MediaPagePartBundle/Tests/unit/Entity/ImagePagePartTest.php
@@ -59,7 +59,7 @@ public function testSetGetAlttext()
     public function testGetDefaultView()
     {
         $defaultView = $this->object->getDefaultView();
-        $this->assertEquals('KunstmaanMediaPagePartBundle:ImagePagePart:view.html.twig', $defaultView);
+        $this->assertEquals('@KunstmaanMediaPagePart/ImagePagePart/view.html.twig', $defaultView);
     }
 
     public function testGetDefaultAdminType()

diff --git a/src/Kunstmaan/MediaPagePartBundle/Tests/unit/Entity/SlidePagePartTest.php b/src/Kunstmaan/MediaPagePartBundle/Tests/unit/Entity/SlidePagePartTest.php
@@ -34,7 +34,7 @@ public function testSetGetMedia()
     public function testGetDefaultView()
     {
         $defaultView = $this->object->getDefaultView();
-        $this->assertEquals('KunstmaanMediaPagePartBundle:SlidePagePart:view.html.twig', $defaultView);
+        $this->assertEquals('@KunstmaanMediaPagePart/SlidePagePart/view.html.twig', $defaultView);
     }
 
     public function testGetDefaultAdminType()

diff --git a/src/Kunstmaan/MediaPagePartBundle/Tests/unit/Entity/VideoPagePartTest.php b/src/Kunstmaan/MediaPagePartBundle/Tests/unit/Entity/VideoPagePartTest.php
@@ -38,7 +38,7 @@ public function testSetGetMedia()
     public function testGetDefaultView()
     {
         $defaultView = $this->object->getDefaultView();
-        $this->assertEquals('KunstmaanMediaPagePartBundle:VideoPagePart:view.html.twig', $defaultView);
+        $this->assertEquals('@KunstmaanMediaPagePart/VideoPagePart/view.html.twig', $defaultView);
     }
 
     public function testGetDefaultAdminType()

diff --git a/src/Kunstmaan/MenuBundle/AdminList/MenuItemAdminListConfigurator.php b/src/Kunstmaan/MenuBundle/AdminList/MenuItemAdminListConfigurator.php
@@ -25,9 +25,9 @@ public function __construct(EntityManager $em, AclHelper $aclHelper = null, Menu
     {
         parent::__construct($em, $aclHelper);
 
-        $this->setListTemplate('KunstmaanMenuBundle:AdminList:list-menu-item.html.twig');
-        $this->setAddTemplate('KunstmaanMenuBundle:AdminList:edit-menu-item.html.twig');
-        $this->setEditTemplate('KunstmaanMenuBundle:AdminList:edit-menu-item.html.twig');
+        $this->setListTemplate('@KunstmaanMenu/AdminList/list-menu-item.html.twig');
+        $this->setAddTemplate('@KunstmaanMenu/AdminList/edit-menu-item.html.twig');
+        $this->setEditTemplate('@KunstmaanMenu/AdminList/edit-menu-item.html.twig');
         $this->menu = $menu;
     }
 
@@ -36,10 +36,10 @@ public function __construct(EntityManager $em, AclHelper $aclHelper = null, Menu
      */
     public function buildFields()
     {
-        $this->addField('title', 'kuma_menu.menu_item.adminlist.field.title', false, 'KunstmaanMenuBundle:AdminList:menu-item-title.html.twig');
-        $this->addField('online', 'kuma_menu.menu_item.adminlist.field.online', false, 'KunstmaanMenuBundle:AdminList:menu-item-online.html.twig');
+        $this->addField('title', 'kuma_menu.menu_item.adminlist.field.title', false, '@KunstmaanMenu/AdminList/menu-item-title.html.twig');
+        $this->addField('online', 'kuma_menu.menu_item.adminlist.field.online', false, '@KunstmaanMenu/AdminList/menu-item-online.html.twig');
         $this->addField('type', 'kuma_menu.menu_item.adminlist.field.type', false);
-        $this->addField('url', 'kuma_menu.menu_item.adminlist.field.url', false, 'KunstmaanMenuBundle:AdminList:menu-item-url.html.twig');
+        $this->addField('url', 'kuma_menu.menu_item.adminlist.field.url', false, '@KunstmaanMenu/AdminList/menu-item-url.html.twig');
         $this->addField('newWindow', 'kuma_menu.menu_item.adminlist.field.new_window', false);
     }
 

diff --git a/src/Kunstmaan/MenuBundle/Service/RenderService.php b/src/Kunstmaan/MenuBundle/Service/RenderService.php
@@ -32,7 +32,7 @@ public function renderMenuItemTemplate(Environment $environment, $node, $options
     {
         $template = isset($options['template']) ? $options['template'] : false;
         if ($template === false) {
-            $template = 'KunstmaanMenuBundle::menu-item.html.twig';
+            $template = '@KunstmaanMenu/menu-item.html.twig';
         }
 
         $hasActiveChild = false;

diff --git a/src/Kunstmaan/NodeBundle/Controller/WidgetsController.php b/src/Kunstmaan/NodeBundle/Controller/WidgetsController.php
@@ -21,7 +21,7 @@ class WidgetsController extends Controller
 {
     /**
      * @Route("/ckselecturl", name="KunstmaanNodeBundle_ckselecturl")
-     * @Template("KunstmaanNodeBundle:Widgets:selectLink.html.twig")
+     * @Template("@KunstmaanNode/Widgets/selectLink.html.twig")
      *
      * @param \Symfony\Component\HttpFoundation\Request $request
      *
@@ -40,7 +40,7 @@ public function ckSelectLinkAction(Request $request)
      * Select a link
      *
      * @Route("/selecturl", name="KunstmaanNodeBundle_selecturl")
-     * @Template("KunstmaanNodeBundle:Widgets:selectLink.html.twig")
+     * @Template("@KunstmaanNode/Widgets/selectLink.html.twig")
      *
      * @param \Symfony\Component\HttpFoundation\Request $request
      *