diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-08-20 08:22:39 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-08-20 08:22:39 +0200 |
commit | 4fcb7eaf139a4d2cbd0f54574e6c51a0fe852ef1 (patch) | |
tree | 4d878e6d4eb5c1baab95cd02e3eb95ee4182a399 /src/Wallabag/CoreBundle/Controller | |
parent | 34437f408c5b7b590aded6795d7ce01bfbfc7711 (diff) | |
parent | 8ce32af61229eec8f4cc34b207273d47f60adc48 (diff) | |
download | wallabag-4fcb7eaf139a4d2cbd0f54574e6c51a0fe852ef1.tar.gz wallabag-4fcb7eaf139a4d2cbd0f54574e6c51a0fe852ef1.tar.zst wallabag-4fcb7eaf139a4d2cbd0f54574e6c51a0fe852ef1.zip |
Merge pull request #1383 from wallabag/cs
CS
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
4 files changed, 21 insertions, 21 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 93ce650e..006fa396 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -136,9 +136,9 @@ class EntryController extends Controller | |||
136 | return $this->render( | 136 | return $this->render( |
137 | 'WallabagCoreBundle:Entry:entries.html.twig', | 137 | 'WallabagCoreBundle:Entry:entries.html.twig', |
138 | array( | 138 | array( |
139 | 'form' => $form->createView(), | 139 | 'form' => $form->createView(), |
140 | 'entries' => $entries, | 140 | 'entries' => $entries, |
141 | 'currentPage' => $page | 141 | 'currentPage' => $page, |
142 | ) | 142 | ) |
143 | ); | 143 | ); |
144 | } | 144 | } |
@@ -178,9 +178,9 @@ class EntryController extends Controller | |||
178 | return $this->render( | 178 | return $this->render( |
179 | 'WallabagCoreBundle:Entry:entries.html.twig', | 179 | 'WallabagCoreBundle:Entry:entries.html.twig', |
180 | array( | 180 | array( |
181 | 'form' => $form->createView(), | 181 | 'form' => $form->createView(), |
182 | 'entries' => $entries, | 182 | 'entries' => $entries, |
183 | 'currentPage' => $page | 183 | 'currentPage' => $page, |
184 | ) | 184 | ) |
185 | ); | 185 | ); |
186 | } | 186 | } |
@@ -220,9 +220,9 @@ class EntryController extends Controller | |||
220 | return $this->render( | 220 | return $this->render( |
221 | 'WallabagCoreBundle:Entry:entries.html.twig', | 221 | 'WallabagCoreBundle:Entry:entries.html.twig', |
222 | array( | 222 | array( |
223 | 'form' => $form->createView(), | 223 | 'form' => $form->createView(), |
224 | 'entries' => $entries, | 224 | 'entries' => $entries, |
225 | 'currentPage' => $page | 225 | 'currentPage' => $page, |
226 | ) | 226 | ) |
227 | ); | 227 | ); |
228 | } | 228 | } |
@@ -265,7 +265,7 @@ class EntryController extends Controller | |||
265 | 265 | ||
266 | $this->get('session')->getFlashBag()->add( | 266 | $this->get('session')->getFlashBag()->add( |
267 | 'notice', | 267 | 'notice', |
268 | 'Entry ' . ($entry->isArchived() ? 'archived' : 'unarchived') | 268 | 'Entry '.($entry->isArchived() ? 'archived' : 'unarchived') |
269 | ); | 269 | ); |
270 | 270 | ||
271 | return $this->redirect($request->headers->get('referer')); | 271 | return $this->redirect($request->headers->get('referer')); |
@@ -290,7 +290,7 @@ class EntryController extends Controller | |||
290 | 290 | ||
291 | $this->get('session')->getFlashBag()->add( | 291 | $this->get('session')->getFlashBag()->add( |
292 | 'notice', | 292 | 'notice', |
293 | 'Entry ' . ($entry->isStarred() ? 'starred' : 'unstarred') | 293 | 'Entry '.($entry->isStarred() ? 'starred' : 'unstarred') |
294 | ); | 294 | ); |
295 | 295 | ||
296 | return $this->redirect($request->headers->get('referer')); | 296 | return $this->redirect($request->headers->get('referer')); |
diff --git a/src/Wallabag/CoreBundle/Controller/SecurityController.php b/src/Wallabag/CoreBundle/Controller/SecurityController.php index a61a898b..f0a7ab6d 100644 --- a/src/Wallabag/CoreBundle/Controller/SecurityController.php +++ b/src/Wallabag/CoreBundle/Controller/SecurityController.php | |||
@@ -25,7 +25,7 @@ class SecurityController extends Controller | |||
25 | return $this->render('WallabagCoreBundle:Security:login.html.twig', array( | 25 | return $this->render('WallabagCoreBundle:Security:login.html.twig', array( |
26 | // last username entered by the user | 26 | // last username entered by the user |
27 | 'last_username' => $session->get(SecurityContext::LAST_USERNAME), | 27 | 'last_username' => $session->get(SecurityContext::LAST_USERNAME), |
28 | 'error' => $error, | 28 | 'error' => $error, |
29 | )); | 29 | )); |
30 | } | 30 | } |
31 | 31 | ||
diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php index 09be1b74..3b844b44 100644 --- a/src/Wallabag/CoreBundle/Controller/StaticController.php +++ b/src/Wallabag/CoreBundle/Controller/StaticController.php | |||
@@ -10,13 +10,14 @@ class StaticController extends Controller | |||
10 | /** | 10 | /** |
11 | * @Route("/howto", name="howto") | 11 | * @Route("/howto", name="howto") |
12 | */ | 12 | */ |
13 | public function howtoAction() | 13 | public function howtoAction() |
14 | { | 14 | { |
15 | return $this->render( | 15 | return $this->render( |
16 | 'WallabagCoreBundle:Static:howto.html.twig', | 16 | 'WallabagCoreBundle:Static:howto.html.twig', |
17 | array() | 17 | array() |
18 | ); | 18 | ); |
19 | } | 19 | } |
20 | |||
20 | /** | 21 | /** |
21 | * @Route("/about", name="about") | 22 | * @Route("/about", name="about") |
22 | */ | 23 | */ |
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index e448cea1..a342ec0b 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php | |||
@@ -23,9 +23,8 @@ class TagController extends Controller | |||
23 | return $this->render( | 23 | return $this->render( |
24 | 'WallabagCoreBundle:Tag:tags.html.twig', | 24 | 'WallabagCoreBundle:Tag:tags.html.twig', |
25 | array( | 25 | array( |
26 | 'tags' => $tags | 26 | 'tags' => $tags, |
27 | ) | 27 | ) |
28 | ); | 28 | ); |
29 | } | 29 | } |
30 | |||
31 | } | 30 | } |