Merge remote-tracking branch 'origin/v2' into v2_fix_material

# Conflicts:
#	src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
This commit is contained in:
Alexandr Danilov 2015-08-10 15:25:23 +03:00
commit 0e654f6273
5 changed files with 122 additions and 2 deletions

View file

@ -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")
*/

View file

@ -0,0 +1,28 @@
{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title %}{% trans %}Howto{% endtrans %}{% endblock %}
{% block content %}
<h2>{% trans %}Howto{% endtrans %}</h2>
<p>{% trans %}There are several ways to save an article:{% endtrans %}</p>
<ul>
<li><a href="{{ path('about') }}">{% trans %}Thanks to this form{% endtrans %}</a></li>
</ul>
<h3>{% trans %}Browser Addons{% endtrans %}</h3>
<ul>
<li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans %}Standard Firefox Add-On{% endtrans %}</a></li>
<li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans %}Chrome Extension{% endtrans %}</a></li>
</ul>
<h3>{% trans %}Mobile Apps{% endtrans %}</h3>
<ul>
<li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans %}via F-Droid{% endtrans %}</a> {% trans %} or {% endtrans %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans %}via Google Play{% endtrans %}</a></li>
<li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
<li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
</ul>
<h3>{% trans %}Bookmarklet{% endtrans %}</h3>
<p>
{% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %} {% trans %}bag it!{% endtrans %}
</p>
{% endblock %}

View file

@ -0,0 +1,53 @@
{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title %}{% trans %}Howto{% endtrans %}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
<div class="row">
<div class="div_tabs col s12">
<ul class="tabs">
<li class="tab col s3"><a class="active" href="#set1">{% trans %}Form{% endtrans %}</a></li>
<li class="tab col s3"><a href="#set2">{% trans %}Browser addons{% endtrans %}</a></li>
<li class="tab col s3"><a href="#set3">{% trans %}Mobile apps{% endtrans %}</a></li>
<li class="tab col s3"><a href="#set4">{% trans %}Bookmarklet{% endtrans %}</a></li>
</ul>
</div>
<div id="set1" class="col s12">
<a href="{{ path('about') }}">{% trans %}Thanks to this form{% endtrans %}</a>
</div>
<div id="set2" class="col s12">
<ul>
<li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans %}Standard Firefox Add-On{% endtrans %}</a></li>
<li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans %}Chrome Extension{% endtrans %}</a></li>
</ul>
</div>
<div id="set3" class="col s12">
<ul>
<li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans %}via F-Droid{% endtrans %}</a> {% trans %} or {% endtrans %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans %}via Google Play{% endtrans %}</a></li>
<li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
<li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
</ul>
</div>
<div id="set4" class="col s12">
{% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %} {% trans %}bag it!{% endtrans %}
</div>
</div>
</div>
</div>
</div>
{% endblock %}

View file

@ -40,10 +40,11 @@
{% set currentRoute = app.request.attributes.get('_route') %}
<li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
<li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
<li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li>
<li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
</ul>
<div class="nav-wrapper nav-panels">

View file

@ -0,0 +1,28 @@
<?php
namespace Wallabag\CoreBundle\Tests\Controller;
use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
class StaticControllerTest extends WallabagCoreTestCase
{
public function testAbout()
{
$this->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());
}
}