Merge remote-tracking branch 'origin/master' into 2.1

This commit is contained in:
Jeremy Benoist
2016-08-22 23:03:16 +02:00
45 changed files with 494 additions and 153 deletions

View File

@ -357,7 +357,7 @@ class EntryController extends Controller
}
/**
* Changes favorite status for an entry.
* Changes starred status for an entry.
*
* @param Request $request
* @param Entry $entry

View File

@ -0,0 +1,27 @@
<?php
namespace Wallabag\CoreBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
class FooterController extends Controller
{
/**
* Display the footer.
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function indexAction()
{
$addonsUrl = $this->container->getParameter('addons_url');
$socialsUrl = $this->container->getParameter('socials_url');
return $this->render(
'WallabagCoreBundle::footer.html.twig',
[
'addonsUrl' => $addonsUrl,
'socialsUrl' => $socialsUrl,
]
);
}
}

View File

@ -12,9 +12,11 @@ class StaticController extends Controller
*/
public function howtoAction()
{
$addonsUrl = $this->container->getParameter('addons_url');
return $this->render(
'WallabagCoreBundle:Static:howto.html.twig',
[]
['addonsUrl' => $addonsUrl]
);
}