Merge pull request #1397 from wallabag/v2-graby

Integrate graby
This commit is contained in:
Nicolas Lœuillet
2015-09-11 20:17:42 +02:00
12 changed files with 730 additions and 358 deletions

View File

@ -30,3 +30,13 @@ services:
wallabag_core.doctrine.prefixed_naming_strategy:
class: Wallabag\CoreBundle\Doctrine\Mapping\PrefixedNamingStrategy
arguments: [%database_table_prefix%]
wallabag_core.graby:
class: Graby\Graby
arguments:
- { error_message: false }
wallabag_core.content_proxy:
class: Wallabag\CoreBundle\Helper\ContentProxy
arguments:
- @wallabag_core.graby

View File

@ -10,7 +10,7 @@
<div class="nav-wrapper cyan darken-1">
<ul>
<li>
<a class="waves-effect" href="/">
<a class="waves-effect" href="{{ path('homepage') }}">
<i class="mdi-action-exit-to-app"></i>
</a>
</li>
@ -36,7 +36,7 @@
</nav>
<ul id="slide-out" class="collapsible side-nav fixed reader-mode" data-collapsible="accordion">
<li class="bold border-bottom hide-on-med-and-down">
<a class="waves-effect collapsible-header" href="/">
<a class="waves-effect collapsible-header" href="{{ path('homepage') }}">
<i class="mdi-action-exit-to-app small"></i>
<span>{% trans %}back{% endtrans %}</span>
</a>