rename syntax for ChillMain twig template calls

Controller/DefaultController.php

@@ -13,7 +13,7 @@ class DefaultController extends Controller
             return $this->redirectToRoute('chill_main_admin_central', [], 302);
         }
         
-        return $this->render('ChillMainBundle::layout.html.twig');
+        return $this->render('@ChillMain/layout.html.twig');
     }
 
     public function indexWithoutLocaleAction()

Controller/LoginController.php

@@ -29,7 +29,7 @@ class LoginController extends Controller
     public function loginAction(Request $request)
     {
 
-        return $this->render('ChillMainBundle:Login:login.html.twig', array(
+        return $this->render('@ChillMain/Login/login.html.twig', array(
             'last_username' => $this->helper->getLastUsername(),
             'error'         => $this->helper->getLastAuthenticationError()
         ));  

Pagination/ChillPaginationTwig.php

@@ -22,6 +22,7 @@
 
 namespace Chill\MainBundle\Pagination;
 
+use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -56,7 +57,7 @@ class ChillPaginationTwig extends AbstractExtension
     }
     
     public function paginationRender(
-          \Twig_Environment $env, 
+          Environment $env,
           PaginatorInterface $paginator, 
           $template = 'ChillMainBundle:Pagination:long.html.twig'
     ) {

Routing/MenuTwig.php

@@ -24,6 +24,7 @@ namespace Chill\MainBundle\Routing;
 use Chill\MainBundle\Routing\MenuComposer;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -86,7 +87,7 @@ class MenuTwig extends AbstractExtension implements ContainerAwareInterface
      * @param string $menuId
      * @param mixed[] $params
      */
-    public function chillMenu(\Twig_Environment $env, $menuId, array $params = array())
+    public function chillMenu(Environment $env, $menuId, array $params = array())
     {
         $resolvedParams = array_merge($this->defaultParams, $params);
 

Templating/Widget/WidgetInterface.php

@@ -2,9 +2,9 @@
 
 namespace Chill\MainBundle\Templating\Widget;
 
-use \Twig_Environment;
+use Twig\Environment;
 
 interface WidgetInterface
 {
-    public function render(Twig_Environment $env, $place, array $context, array $config);
+    public function render(Environment $env, $place, array $context, array $config);
 }

Templating/Widget/WidgetRenderingTwig.php

@@ -22,6 +22,7 @@ namespace Chill\MainBundle\Templating\Widget;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
 use Chill\MainBundle\Templating\Events\DelegatedBlockRenderingEvent;
+use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -105,7 +106,7 @@ class WidgetRenderingTwig extends AbstractExtension
         );
     }
     
-    public function renderingWidget(\Twig_Environment $env, $block, array $context = array())
+    public function renderingWidget(Environment $env, $block, array $context = array())
     {
         // get the content of widgets
         $content = '';

templates/Admin/index.html.twig

@@ -1,4 +1,4 @@
-{% extends "ChillMainBundle::Admin/layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'Administration interface'|trans }}</h1>

templates/Admin/layout.html.twig

@@ -21,12 +21,12 @@
 	layout.
 #}
 
-{% extends "ChillMainBundle::layout.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
 
 {% block navigation_search_bar %}{% endblock %}
 {% block navigation_section_menu %}
 	{{ chill_menu('admin_section', {
-	   	'layout': 'ChillMainBundle::Menu/adminSection.html.twig',
+	   	'layout': '@ChillMain/Menu/adminSection.html.twig',
 	}) }}
 {% endblock %}
 

templates/Admin/layoutWithVerticalMenu.html.twig

@@ -21,12 +21,12 @@
 	layout.
 #}
 
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
 {% block navigation_search_bar %}{% endblock %}
 {% block navigation_section_menu %}
 	{{ chill_menu('admin_section', {
-	   	'layout': 'ChillMainBundle::Menu/adminSection.html.twig',
+	   	'layout': '@ChillMain/Menu/adminSection.html.twig',
 	}) }}
 {% endblock %}
 

templates/Admin/layout_permissions.html.twig

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "ChillMainBundle::Admin/layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_permissions', {
-        'layout': 'ChillMainBundle::Menu/admin_permissions.html.twig',
+        'layout': '@ChillMain/Menu/admin_permissions.html.twig',
     }) }}
 {% endblock %}
 

templates/Center/edit.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'Center edit'|trans }}{% endblock %}
 

templates/Center/index.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'Center list'|trans }}{% endblock %}
 

templates/Center/new.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'Center creation'|trans }}{% endblock %}
 

templates/Center/show.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'Centre %name%'|trans({ '%name%': entity.name }) }}{% endblock %}
 

templates/Export/download.html.twig

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
 {% block title "Download export"|trans ~ export.title|trans %}
     

templates/Export/layout.html.twig

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "ChillMainBundle::layout.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
 
 {% block title %}{{ 'Exports list'|trans }}{% endblock %}
 

templates/Export/new.html.twig

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
 {% block title %}{{ export.title|trans }}{% endblock %}
 

templates/Export/new_centers_step.html.twig

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
 {% block title %}{{ export.title|trans }}{% endblock %}
 

templates/Export/new_formatter_step.html.twig

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
 {% block title %}{{ export.title|trans }}{% endblock %}
 

templates/Menu/admin.html.twig

@@ -16,5 +16,5 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "ChillMainBundle::Menu/verticalMenu.html.twig" %}
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
 {% block v_menu_title %}{{ 'Admin Menu'|trans }}{% endblock %}

templates/Menu/admin_permissions.html.twig

@@ -16,5 +16,5 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "ChillMainBundle::Menu/verticalMenu.html.twig" %}
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
 {% block v_menu_title %}{{ 'Permissions Menu'|trans }}{% endblock %}

templates/Menu/export.html.twig

@@ -16,5 +16,5 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "ChillMainBundle::Menu/verticalMenu.html.twig" %}
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
 {% block v_menu_title %}{{ 'Export Menu'|trans }}{% endblock %}

templates/Password/password.html.twig

@@ -17,7 +17,7 @@
 #}
 
 
-{%  extends "ChillMainBundle::layout.html.twig" %}
+{%  extends "@ChillMain/layout.html.twig" %}
 
 
 {% block title %}{{"Change my password"|trans}}{% endblock %}

templates/PermissionsGroup/edit.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}{% endblock %}
 

templates/PermissionsGroup/index.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'Permissions group list'|trans }}{% endblock %}
 

templates/PermissionsGroup/new.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'New permission group'|trans }}{% endblock %}
 

templates/PermissionsGroup/show.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'Permission group "%name%"'|trans({ '%name%': entity.name }) }}{% endblock %}
 

templates/Scope/edit.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'Circle edit'|trans }}{% endblock %}
 

templates/Scope/index.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'List circles'|trans }}{% endblock %}
 

templates/Scope/new.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'Circle creation'|trans }}{% endblock %}
 

templates/Scope/show.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'Circle'|trans }}{% endblock %}
 

templates/Search/advanced_search.html.twig

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{%  extends "ChillMainBundle::layout.html.twig" %}
+{%  extends "@ChillMain/layout.html.twig" %}
 
 
 {% block title title|trans %}

templates/Search/error.html.twig

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{%  extends "ChillMainBundle::layout.html.twig" %}
+{%  extends "@ChillMain/layout.html.twig" %}
 
 {% set _search_pattern = pattern %}
 

templates/Search/list.html.twig

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{%  extends "ChillMainBundle::layout.html.twig" %}
+{%  extends "@ChillMain/layout.html.twig" %}
 
 {% set _search_pattern = pattern %}
 

templates/User/edit.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'User edit'|trans }}{% endblock %}
 

templates/User/edit_password.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'Edit password for %username%'|trans( { '%username%': entity.username } ) }}{% endblock %}
 

templates/User/index.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'user list'|trans|capitalize }}{% endblock %}
 

templates/User/new.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'User creation'|trans }}{% endblock %}
 

templates/User/show.html.twig

@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
 
 {% block title %}{{ 'User %username%'|trans({ '%username%': entity.username }) }}{% endblock %}
 

templates/layout.html.twig

@@ -46,12 +46,12 @@
                 <ul class="navigation-menu">
                     {% block navigation_section_menu %}
                         {{ chill_menu('section', {
-                            'layout': 'ChillMainBundle::Menu/section.html.twig',
+                            'layout': '@ChillMain/Menu/section.html.twig',
                         }) }}
                     {% endblock %}
 
                     {{ chill_menu('user', {
-                        'layout': 'ChillMainBundle::Menu/user.html.twig',
+                        'layout': '@ChillMain/Menu/user.html.twig',
                     }) }}
 
                     {% if  available_languages|length == 1 %}

templates/layoutWithVerticalMenu.html.twig

@@ -21,7 +21,7 @@
     ( for the vertical menu you can extends Menu/veticalMenu.html.twig ).
 #}
 
-{% extends "ChillMainBundle::layout.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
 
 {% block sublayout_containter %}
     <div class="container content">