diff options
17 files changed, 41 insertions, 125 deletions
diff --git a/composer.json b/composer.json index aa120970..7dbc6772 100644 --- a/composer.json +++ b/composer.json | |||
@@ -91,11 +91,8 @@ | |||
91 | "fabpot/php-cs-fixer": "~1.9" | 91 | "fabpot/php-cs-fixer": "~1.9" |
92 | }, | 92 | }, |
93 | "scripts": { | 93 | "scripts": { |
94 | "build-parameters": [ | ||
95 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters" | ||
96 | ], | ||
97 | "post-cmd": [ | 94 | "post-cmd": [ |
98 | "@build-parameters", | 95 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", |
99 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", | 96 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", |
100 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", | 97 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", |
101 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", | 98 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", |
@@ -117,13 +114,7 @@ | |||
117 | "symfony-tests-dir": "tests", | 114 | "symfony-tests-dir": "tests", |
118 | "symfony-assets-install": "relative", | 115 | "symfony-assets-install": "relative", |
119 | "incenteev-parameters": { | 116 | "incenteev-parameters": { |
120 | "file": "app/config/parameters.yml", | 117 | "file": "app/config/parameters.yml" |
121 | "env-map": { | ||
122 | "mailer_host": "WALLABAG_MAILER_HOST", | ||
123 | "mailer_user": "WALLABAG_MAILER_USER", | ||
124 | "mailer_password": "WALLABAG_MAILER_PASSWORD", | ||
125 | "secret": "WALLABAG_SECRET" | ||
126 | } | ||
127 | } | 118 | } |
128 | }, | 119 | }, |
129 | "autoload": { | 120 | "autoload": { |
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index bc35a02b..182ed418 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
@@ -62,6 +62,11 @@ To start php's build-in server and test if everything did install correctly, you | |||
62 | 62 | ||
63 | And access wallabag at http://yourserverip:8000 | 63 | And access wallabag at http://yourserverip:8000 |
64 | 64 | ||
65 | .. note:: | ||
66 | |||
67 | To define parameters with environment variables, you have to set these variables with ``SYMFONY__`` prefix. For example, ``SYMFONY__DATABASE_DRIVER``. You can have a look to the `Symfony documentation | ||
68 | <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__. | ||
69 | |||
65 | Installing on Apache | 70 | Installing on Apache |
66 | -------------------- | 71 | -------------------- |
67 | 72 | ||
@@ -146,3 +151,7 @@ Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe | |||
146 | } | 151 | } |
147 | 152 | ||
148 | After reloading or restarting nginx, you should now be able to access wallabag at http://domain.tld. | 153 | After reloading or restarting nginx, you should now be able to access wallabag at http://domain.tld. |
154 | |||
155 | .. note:: | ||
156 | |||
157 | When you want to import large file into wallabag, you need to add this line in your nginx configuration ``client_max_body_size XM; # allows file uploads up to X megabytes``. | ||
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 489304d6..42208871 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst | |||
@@ -60,6 +60,11 @@ Pour démarrer le serveur interne à php et vérifier que tout s'est installé c | |||
60 | 60 | ||
61 | Et accéder wallabag à l'adresse http://lipdevotreserveur:8000 | 61 | Et accéder wallabag à l'adresse http://lipdevotreserveur:8000 |
62 | 62 | ||
63 | .. note:: | ||
64 | |||
65 | Pour définir des paramètres via des variables d'environnement, vous pouvez les spécifier avec le préfixe ``SYMFONY__``. Par exemple, ``SYMFONY__DATABASE_DRIVER``. Vous pouvez lire `documentation Symfony | ||
66 | <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__ pour en savoir plus. | ||
67 | |||
63 | Installation avec Apache | 68 | Installation avec Apache |
64 | ------------------------ | 69 | ------------------------ |
65 | 70 | ||
@@ -144,3 +149,7 @@ En imaginant que vous vouliez installer wallabag dans le dossier /var/www/wallab | |||
144 | } | 149 | } |
145 | 150 | ||
146 | Après que vous ayez rechargé/redémarré Nginx, vous devriez pouvoir avoir accès à wallabag à l'adresse http://domain.tld. | 151 | Après que vous ayez rechargé/redémarré Nginx, vous devriez pouvoir avoir accès à wallabag à l'adresse http://domain.tld. |
152 | |||
153 | .. note:: | ||
154 | |||
155 | Si vous voulez importer un fichier important dans wallabag, vous devez ajouter cette ligne dans votre configuration nginx ``client_max_body_size XM; # allows file uploads up to X megabytes``. | ||
diff --git a/docs/pt-br/conf.py b/docs/pt-br/conf.py deleted file mode 100644 index 582ad114..00000000 --- a/docs/pt-br/conf.py +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | # -*- coding: utf-8 -*- | ||
2 | # | ||
3 | # wallabag documentation build configuration file, created by | ||
4 | # sphinx-quickstart on Fri Oct 16 06:47:23 2015. | ||
5 | |||
6 | import sys | ||
7 | import os | ||
8 | |||
9 | extensions = [] | ||
10 | templates_path = ['_templates'] | ||
11 | source_suffix = '.rst' | ||
12 | master_doc = 'index' | ||
13 | project = u'wallabag-pt' | ||
14 | copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence' | ||
15 | version = '2.0.0' | ||
16 | release = version | ||
17 | exclude_patterns = ['_build'] | ||
18 | pygments_style = 'sphinx' | ||
19 | html_theme = 'default' | ||
20 | html_static_path = ['_static'] | ||
21 | htmlhelp_basename = 'wallabagfrdoc' | ||
22 | |||
23 | latex_elements = { | ||
24 | } | ||
25 | |||
26 | latex_documents = [ | ||
27 | ('index', 'wallabag-pt.tex', u'wallabag Documentation', | ||
28 | u'Nicolas Lœuillet', 'manual'), | ||
29 | ] | ||
30 | |||
31 | man_pages = [ | ||
32 | ('index', 'wallabagpt', u'wallabag Documentation', | ||
33 | [u'Nicolas Lœuillet'], 1) | ||
34 | ] | ||
35 | |||
36 | texinfo_documents = [ | ||
37 | ('index', 'wallabag', u'wallabag Documentation', | ||
38 | u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.', | ||
39 | 'Miscellaneous'), | ||
40 | ] | ||
41 | |||
42 | ##### Guzzle sphinx theme | ||
43 | |||
44 | import guzzle_sphinx_theme | ||
45 | html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator' | ||
46 | html_theme_path = guzzle_sphinx_theme.html_theme_path() | ||
47 | html_theme = 'guzzle_sphinx_theme' | ||
48 | |||
49 | # Custom sidebar templates, maps document names to template names. | ||
50 | html_sidebars = { | ||
51 | '**': ['logo-text.html', 'globaltoc.html', 'searchbox.html'] | ||
52 | } | ||
53 | |||
54 | # Register the theme as an extension to generate a sitemap.xml | ||
55 | extensions.append("guzzle_sphinx_theme") | ||
diff --git a/docs/pt-br/index.rst b/docs/pt-br/index.rst deleted file mode 100644 index c0076d25..00000000 --- a/docs/pt-br/index.rst +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | wallabag documentation | ||
2 | ====================== | ||
3 | |||
4 | .. image:: ../img/wallabag.png | ||
5 | :alt: wallabag logo | ||
6 | :align: center | ||
7 | |||
8 | **wallabag** É uma aplicação "leia mais tarde": Ele salva páginas da web mantendo apenas o conteúdo. Elementos como ícones de navegação ou propaganda são deletedos. | ||
9 | |||
10 | A documentação principal desta aplicação é organizada em duas seções: | ||
11 | |||
12 | * :ref:`doc-usuario` | ||
13 | * :ref:`doc-desenvolvedor` | ||
14 | |||
15 | .. _user-docs: | ||
16 | |||
17 | .. toctree:: | ||
18 | :maxdepth: 2 | ||
19 | :caption: Documentação do usuário | ||
20 | |||
21 | user/criar_conta | ||
22 | user/login | ||
23 | user/configuração | ||
24 | user/primeiro_artigo | ||
25 | user/importar | ||
26 | user/baixar_artigos | ||
27 | user/filtros | ||
28 | user/tags | ||
29 | |||
30 | .. _dev-docs: | ||
31 | |||
32 | .. toctree:: | ||
33 | :maxdepth: 2 | ||
34 | :caption: Documentação do desenvolvedor | ||
35 | |||
36 | developer/docker | ||
diff --git a/docs/pt-br/requirements.txt b/docs/pt-br/requirements.txt deleted file mode 100644 index 06fc8973..00000000 --- a/docs/pt-br/requirements.txt +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | Sphinx>=1.3.0,<1.4.0 | ||
2 | guzzle_sphinx_theme>=0.7.0,<0.8.0 | ||
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index 744e1a60..da671a61 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php | |||
@@ -43,8 +43,8 @@ class WallabagRestController extends FOSRestController | |||
43 | { | 43 | { |
44 | $this->validateAuthentication(); | 44 | $this->validateAuthentication(); |
45 | 45 | ||
46 | $isArchived = (int) $request->query->get('archive'); | 46 | $isArchived = (null === $request->query->get('archive')) ? null : (bool) $request->query->get('archive'); |
47 | $isStarred = (int) $request->query->get('starred'); | 47 | $isStarred = (null === $request->query->get('starred')) ? null : (bool) $request->query->get('starred'); |
48 | $sort = $request->query->get('sort', 'created'); | 48 | $sort = $request->query->get('sort', 'created'); |
49 | $order = $request->query->get('order', 'desc'); | 49 | $order = $request->query->get('order', 'desc'); |
50 | $page = (int) $request->query->get('page', 1); | 50 | $page = (int) $request->query->get('page', 1); |
@@ -52,7 +52,7 @@ class WallabagRestController extends FOSRestController | |||
52 | 52 | ||
53 | $pager = $this->getDoctrine() | 53 | $pager = $this->getDoctrine() |
54 | ->getRepository('WallabagCoreBundle:Entry') | 54 | ->getRepository('WallabagCoreBundle:Entry') |
55 | ->findEntries($this->getUser()->getId(), (bool) $isArchived, (bool) $isStarred, $sort, $order); | 55 | ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order); |
56 | 56 | ||
57 | $pager->setCurrentPage($page); | 57 | $pager->setCurrentPage($page); |
58 | $pager->setMaxPerPage($perPage); | 58 | $pager->setMaxPerPage($perPage); |
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 6665f4b5..c5a5a519 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php | |||
@@ -232,11 +232,6 @@ class InstallCommand extends ContainerAwareCommand | |||
232 | 232 | ||
233 | $settings = [ | 233 | $settings = [ |
234 | [ | 234 | [ |
235 | 'name' => 'download_pictures', | ||
236 | 'value' => '1', | ||
237 | 'section' => 'entry', | ||
238 | ], | ||
239 | [ | ||
240 | 'name' => 'carrot', | 235 | 'name' => 'carrot', |
241 | 'value' => '1', | 236 | 'value' => '1', |
242 | 'section' => 'entry', | 237 | 'section' => 'entry', |
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php index 1f4cafdf..09058796 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php | |||
@@ -16,11 +16,6 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface | |||
16 | { | 16 | { |
17 | $settings = [ | 17 | $settings = [ |
18 | [ | 18 | [ |
19 | 'name' => 'download_pictures', | ||
20 | 'value' => '1', | ||
21 | 'section' => 'entry', | ||
22 | ], | ||
23 | [ | ||
24 | 'name' => 'carrot', | 19 | 'name' => 'carrot', |
25 | 'value' => '1', | 20 | 'value' => '1', |
26 | 'section' => 'entry', | 21 | 'section' => 'entry', |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 3dc22998..8f3e4267 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -176,7 +176,7 @@ entry: | |||
176 | set_as_read: 'Mark as read' | 176 | set_as_read: 'Mark as read' |
177 | set_as_unread: 'Mark as unread' | 177 | set_as_unread: 'Mark as unread' |
178 | set_as_favorite: 'Favorite' | 178 | set_as_favorite: 'Favorite' |
179 | view_original_article: 'Orignal article' | 179 | view_original_article: 'Original article' |
180 | re_fetch_content: 'Re-fetch content' | 180 | re_fetch_content: 'Re-fetch content' |
181 | delete: 'Delete' | 181 | delete: 'Delete' |
182 | add_a_tag: 'Add a tag' | 182 | add_a_tag: 'Add a tag' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 0798962c..c51f90d2 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -246,7 +246,7 @@ | |||
246 | <tr> | 246 | <tr> |
247 | <td>isArchived</td> | 247 | <td>isArchived</td> |
248 | <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td> | 248 | <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td> |
249 | <td>=></td> | 249 | <td>>=</td> |
250 | <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td> | 250 | <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td> |
251 | </tr> | 251 | </tr> |
252 | <tr> | 252 | <tr> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig index 7ff64ca6..67696a7b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | <ul> | 15 | <ul> |
16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> | 16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> |
17 | <li><a href="http://doc.wallabag.org/en/v2-documentation-api/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li> | 17 | <li><a href="http://doc.wallabag.org/en/v2/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li> |
18 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li> | 18 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li> |
19 | </ul> | 19 | </ul> |
20 | 20 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 3cda3949..5a800332 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | |||
@@ -22,7 +22,7 @@ | |||
22 | {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %} | 22 | {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %} |
23 | {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %} | 23 | {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %} |
24 | {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %} | 24 | {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %} |
25 | {% if craue_setting('show_printlink') %}<li><a title="{{ 'entry.view.left_menu.print'|trans }}" class="tool icon icon-print" href="javascript: window.print();"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li>{% endif %} | 25 | {% if craue_setting('show_printlink') %}<li><a title="{{ 'entry.view.left_menu.print'|trans }}" class="tool icon icon-print" href="javascript: window.print();"><span>{{ 'entry.view.left_menu.print'|trans }}</span></a></li>{% endif %} |
26 | {% if craue_setting('export_epub') %}<li><a href="?epub&method=id&value={{ entry.id }}" title="Generate ePub file">EPUB</a></li>{% endif %} | 26 | {% if craue_setting('export_epub') %}<li><a href="?epub&method=id&value={{ entry.id }}" title="Generate ePub file">EPUB</a></li>{% endif %} |
27 | {% if craue_setting('export_mobi') %}<li><a href="?mobi&method=id&value={{ entry.id }}" title="Generate Mobi file">MOBI</a></li>{% endif %} | 27 | {% if craue_setting('export_mobi') %}<li><a href="?mobi&method=id&value={{ entry.id }}" title="Generate Mobi file">MOBI</a></li>{% endif %} |
28 | {% if craue_setting('export_pdf') %}<li><a href="?pdf&method=id&value={{ entry.id }}" title="Generate PDF file">PDF</a></li>{% endif %} | 28 | {% if craue_setting('export_pdf') %}<li><a href="?pdf&method=id&value={{ entry.id }}" title="Generate PDF file">PDF</a></li>{% endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 5b94f01c..5a90f227 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
@@ -278,7 +278,7 @@ | |||
278 | <tr> | 278 | <tr> |
279 | <td>isArchived</td> | 279 | <td>isArchived</td> |
280 | <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td> | 280 | <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td> |
281 | <td>=></td> | 281 | <td>>=</td> |
282 | <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td> | 282 | <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td> |
283 | </tr> | 283 | </tr> |
284 | <tr> | 284 | <tr> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig index 7ff64ca6..67696a7b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | <ul> | 15 | <ul> |
16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> | 16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> |
17 | <li><a href="http://doc.wallabag.org/en/v2-documentation-api/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li> | 17 | <li><a href="http://doc.wallabag.org/en/v2/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li> |
18 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li> | 18 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li> |
19 | </ul> | 19 | </ul> |
20 | 20 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 8782d639..15eb16d4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -74,8 +74,7 @@ | |||
74 | 74 | ||
75 | <div class="estimatedTime grey-text"> | 75 | <div class="estimatedTime grey-text"> |
76 | <span class="tool reading-time"> | 76 | <span class="tool reading-time"> |
77 | {{ 'entry.list.reading_time'|trans }} | 77 | {% if readingTime > 0 %}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }}{% else %}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{% endif %} |
78 | {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}<small class="inferieur"><</small> 1{% endif %} min | ||
79 | </span> | 78 | </span> |
80 | </div> | 79 | </div> |
81 | 80 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 66435699..e89aea3a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -138,6 +138,17 @@ | |||
138 | </div> | 138 | </div> |
139 | </li> | 139 | </li> |
140 | 140 | ||
141 | {% if craue_setting('show_printlink') %} | ||
142 | <li class="bold border-bottom hide-on-med-and-down"> | ||
143 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.print'|trans }}" href="javascript: window.print();"> | ||
144 | <i class="mdi-action-print small"></i> | ||
145 | <span>{{ 'entry.view.left_menu.print'|trans }}</span> | ||
146 | </a> | ||
147 | <div class="collapsible-body"></div> | ||
148 | </li> | ||
149 | {% endif %} | ||
150 | |||
151 | |||
141 | <li class="bold"> | 152 | <li class="bold"> |
142 | <a class="waves-effect collapsible-header"> | 153 | <a class="waves-effect collapsible-header"> |
143 | <i class="mdi-file-file-download small"></i> | 154 | <i class="mdi-file-file-download small"></i> |