From: Jeremy Benoist Date: Mon, 10 Aug 2015 12:15:11 +0000 (+0200) Subject: Merge pull request #1295 from wallabag/v2-howto X-Git-Tag: 2.0.0-alpha.0~51 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=f48a0189290ae6dbdb0412a3abd95acd257e55cd;hp=47cadf36c8f7c20ba1edf26e184637d33a52cf35;p=github%2Fwallabag%2Fwallabag.git Merge pull request #1295 from wallabag/v2-howto add howto page --- diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php index 07931f58..09be1b74 100644 --- a/src/Wallabag/CoreBundle/Controller/StaticController.php +++ b/src/Wallabag/CoreBundle/Controller/StaticController.php @@ -7,6 +7,16 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; class StaticController extends Controller { + /** + * @Route("/howto", name="howto") + */ + public function howtoAction() + { + return $this->render( + 'WallabagCoreBundle:Static:howto.html.twig', + array() + ); + } /** * @Route("/about", name="about") */ diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig new file mode 100644 index 00000000..f25acb5d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig @@ -0,0 +1,28 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Howto{% endtrans %}{% endblock %} + +{% block content %} +

{% trans %}Howto{% endtrans %}

+ +

{% trans %}There are several ways to save an article:{% endtrans %}

+ +

{% trans %}Browser Addons{% endtrans %}

+ +

{% trans %}Mobile Apps{% endtrans %}

+ +

{% trans %}Bookmarklet{% endtrans %}

+

+ {% trans %}Drag & drop this link to your bookmarks bar:{% endtrans %} {% trans %}bag it!{% endtrans %} +

+ +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig new file mode 100644 index 00000000..245d14e3 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig @@ -0,0 +1,53 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Howto{% endtrans %}{% endblock %} + +{% block content %} + +
+
+
+ +
+
+ +
+ + + + + + + + + + + +
+ {% trans %}Drag & drop this link to your bookmarks bar:{% endtrans %} {% trans %}bag it!{% endtrans %} +
+ +
+ +
+
+
+{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig index 7070a399..8c942165 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig @@ -76,6 +76,7 @@
  • {% trans %}archive{% endtrans %}
  • {% trans %}tags{% endtrans %}
  • {% trans %}config{% endtrans %}
    • +
  • {% trans %}howto{% endtrans %}
  • {% trans %}logout{% endtrans %}
    • diff --git a/src/Wallabag/CoreBundle/Tests/Controller/StaticControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/StaticControllerTest.php new file mode 100644 index 00000000..6d7976c4 --- /dev/null +++ b/src/Wallabag/CoreBundle/Tests/Controller/StaticControllerTest.php @@ -0,0 +1,28 @@ +logInAs('admin'); + $client = $this->getClient(); + + $client->request('GET', '/about'); + + $this->assertEquals(200, $client->getResponse()->getStatusCode()); + } + + public function testHowto() + { + $this->logInAs('admin'); + $client = $this->getClient(); + + $client->request('GET', '/howto'); + + $this->assertEquals(200, $client->getResponse()->getStatusCode()); + } +}