Merge branch 'dev-master' of gitlab.deblan.org:deblan/defis48 into dev-master

This commit is contained in:
Dorian Lods 2016-01-12 20:37:56 +01:00
commit e3569d0c15
5 changed files with 11 additions and 3 deletions

2
.gitignore vendored
View File

@ -12,3 +12,5 @@
!var/SymfonyRequirements.php
/vendor/
/web/bundles/
/tags
*.swp

View File

@ -4,14 +4,16 @@ namespace Mmi\Bundle\ChallengeBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
class DefaultController extends Controller
{
/**
* @Route("/")
* @Template()
*/
public function indexAction()
{
return $this->render('MmiChallengeBundle:Default:index.html.twig');
return [];
}
}

View File

@ -0,0 +1 @@
{% extends "MmiChallengeBundle:Default:base.html.twig" %}

View File

@ -4,14 +4,16 @@ namespace Mmi\Bundle\EnigmaBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
class DefaultController extends Controller
{
/**
* @Route("/")
* @Route("/enigma")
* @Template()
*/
public function indexAction()
{
return $this->render('MmiEnigmaBundle:Default:index.html.twig');
return [];
}
}

View File

@ -0,0 +1 @@
{% extends "MmiEnigmaBundle:Default:base.html.twig" %}