Merge branch 'dev-master' of gitlab.deblan.org:deblan/defis48 into dev-master
This commit is contained in:
commit
e3569d0c15
|
@ -12,3 +12,5 @@
|
|||
!var/SymfonyRequirements.php
|
||||
/vendor/
|
||||
/web/bundles/
|
||||
/tags
|
||||
*.swp
|
||||
|
|
|
@ -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 [];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
{% extends "MmiChallengeBundle:Default:base.html.twig" %}
|
|
@ -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 [];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
{% extends "MmiEnigmaBundle:Default:base.html.twig" %}
|
Loading…
Reference in New Issue