diff options
-rw-r--r-- | app/config/config.yml | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/base.html.twig | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Tools/Utils.php | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 5b26b06f..efc815b8 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -51,6 +51,7 @@ twig: | |||
51 | form: | 51 | form: |
52 | resources: | 52 | resources: |
53 | - LexikFormFilterBundle:Form:form_div_layout.html.twig | 53 | - LexikFormFilterBundle:Form:form_div_layout.html.twig |
54 | |||
54 | # Assetic Configuration | 55 | # Assetic Configuration |
55 | assetic: | 56 | assetic: |
56 | debug: "%kernel.debug%" | 57 | debug: "%kernel.debug%" |
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index e27aceae..ac5d2bf9 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -71,7 +71,7 @@ | |||
71 | <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> | 71 | <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> |
72 | <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> | 72 | <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> |
73 | <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> | 73 | <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> |
74 | <li><a href="{{ path ('tag') }}">{% trans %}tags{% endtrans %}</a></li> | 74 | <li><a href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li> |
75 | <li><a href="{{ path('new') }}">{% trans %}save a link{% endtrans %}</a></li> | 75 | <li><a href="{{ path('new') }}">{% trans %}save a link{% endtrans %}</a></li> |
76 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> | 76 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> |
77 | <div id="search-form" class="messages info popup-form"> | 77 | <div id="search-form" class="messages info popup-form"> |
diff --git a/src/Wallabag/CoreBundle/Tools/Utils.php b/src/Wallabag/CoreBundle/Tools/Utils.php index a4fbcffd..a16baca9 100644 --- a/src/Wallabag/CoreBundle/Tools/Utils.php +++ b/src/Wallabag/CoreBundle/Tools/Utils.php | |||
@@ -28,7 +28,7 @@ class Utils | |||
28 | 28 | ||
29 | /** | 29 | /** |
30 | * For a given text, we calculate reading time for an article | 30 | * For a given text, we calculate reading time for an article |
31 | * based on 200 words per minute | 31 | * based on 200 words per minute. |
32 | * | 32 | * |
33 | * @param $text | 33 | * @param $text |
34 | * | 34 | * |