From 39f27d6370c5d280375b2e1f93de464ecf5f4f96 Mon Sep 17 00:00:00 2001
From: Simounet <contact@simounet.net>
Date: Mon, 6 Jun 2016 20:59:20 +0200
Subject: Handling socials links into a config file

---
 .../CoreBundle/Controller/FooterController.php     | 26 ++++++++++++++++++++++
 .../CoreBundle/Controller/StaticController.php     |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 src/Wallabag/CoreBundle/Controller/FooterController.php

(limited to 'src/Wallabag/CoreBundle/Controller')

diff --git a/src/Wallabag/CoreBundle/Controller/FooterController.php b/src/Wallabag/CoreBundle/Controller/FooterController.php
new file mode 100644
index 00000000..de809332
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Controller/FooterController.php
@@ -0,0 +1,26 @@
+<?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
+            ]
+        );
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php
index b41302f8..f5fcabd8 100644
--- a/src/Wallabag/CoreBundle/Controller/StaticController.php
+++ b/src/Wallabag/CoreBundle/Controller/StaticController.php
@@ -12,9 +12,10 @@ class StaticController extends Controller
      */
     public function howtoAction()
     {
+        $addonsUrl = $this->container->getParameter('addons_url');
         return $this->render(
             'WallabagCoreBundle:Static:howto.html.twig',
-            []
+            ['addonsUrl' => $addonsUrl]
         );
     }
 
-- 
cgit v1.2.3


From 57c608fa94cdc148f5fc48b7c1e984bbf507e34b Mon Sep 17 00:00:00 2001
From: Simounet <contact@simounet.net>
Date: Wed, 20 Jul 2016 23:08:04 +0200
Subject: php-cs-fixer pass

---
 src/Wallabag/CoreBundle/Controller/FooterController.php | 5 +++--
 src/Wallabag/CoreBundle/Controller/StaticController.php | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Controller')

diff --git a/src/Wallabag/CoreBundle/Controller/FooterController.php b/src/Wallabag/CoreBundle/Controller/FooterController.php
index de809332..fd93c436 100644
--- a/src/Wallabag/CoreBundle/Controller/FooterController.php
+++ b/src/Wallabag/CoreBundle/Controller/FooterController.php
@@ -7,7 +7,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 class FooterController extends Controller
 {
     /**
-     * Display the footer
+     * Display the footer.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -15,11 +15,12 @@ class FooterController extends Controller
     {
         $addonsUrl = $this->container->getParameter('addons_url');
         $socialsUrl = $this->container->getParameter('socials_url');
+
         return $this->render(
             'WallabagCoreBundle::footer.html.twig',
             [
                 'addonsUrl' => $addonsUrl,
-                'socialsUrl' => $socialsUrl
+                'socialsUrl' => $socialsUrl,
             ]
         );
     }
diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php
index f5fcabd8..2a57f06f 100644
--- a/src/Wallabag/CoreBundle/Controller/StaticController.php
+++ b/src/Wallabag/CoreBundle/Controller/StaticController.php
@@ -13,6 +13,7 @@ class StaticController extends Controller
     public function howtoAction()
     {
         $addonsUrl = $this->container->getParameter('addons_url');
+
         return $this->render(
             'WallabagCoreBundle:Static:howto.html.twig',
             ['addonsUrl' => $addonsUrl]
-- 
cgit v1.2.3


From 519ba0b5e71cd9b5abd620f682fd2296e6180af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 18 Aug 2016 11:58:35 +0200
Subject: Replaced favorite word/icon with star one Fix #2041

---
 src/Wallabag/CoreBundle/Controller/EntryController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Controller')

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 4eb314f7..775dfccd 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -357,7 +357,7 @@ class EntryController extends Controller
     }
 
     /**
-     * Changes favorite status for an entry.
+     * Changes star status for an entry.
      *
      * @param Request $request
      * @param Entry   $entry
-- 
cgit v1.2.3


From eecd7e406d46bc34af9aeefa19370df657d2a4fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 18 Aug 2016 15:30:28 +0200
Subject: Fixed some translations

---
 src/Wallabag/CoreBundle/Controller/EntryController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Controller')

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 775dfccd..ccdf9406 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -357,7 +357,7 @@ class EntryController extends Controller
     }
 
     /**
-     * Changes star status for an entry.
+     * Changes starred status for an entry.
      *
      * @param Request $request
      * @param Entry   $entry
-- 
cgit v1.2.3