pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add warning message for import + download images

Browse Source 
When import isn't async and downloading images is enabled, we warn the user that import can fail.
Also, added missing translations
This commit is contained in:
Jeremy Benoist
2016-11-03 15:59:18 +01:00
parent e46fdf3096
commit ca08d02f2f
19 changed files with 81 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/ImportBundle/Resources/views/Chrome/index.html.twig
View File

@ -6,6 +6,8 @@
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote>
<p>{{ 'import.chrome.how_to'|trans }}</p>

2
src/Wallabag/ImportBundle/Resources/views/Firefox/index.html.twig
View File

@ -6,6 +6,8 @@
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote>
<p>{{ 'import.firefox.how_to'|trans }}</p>

7
src/Wallabag/ImportBundle/Resources/views/Import/_workerEnabled.html.twig → src/Wallabag/ImportBundle/Resources/views/Import/_information.html.twig
View File

@ -1,8 +1,15 @@
{% set redis = craue_setting('import_with_redis') %}
{% set rabbit = craue_setting('import_with_rabbitmq') %}
{% set downloadImages = craue_setting('download_images_enabled') %}
{% if redis or rabbit %}
<div class="card-panel yellow darken-1 black-text">
{{ 'import.worker.enabled'|trans }} <strong>{% if rabbit %}RabbitMQ{% elseif redis %}Redis{% endif %}</strong>
</div>
{% endif %}
{% if not redis and not rabbit and downloadImages %}
<div class="card-panel orange darken-1 black-text">
{{ 'import.worker.download_images_warning'|trans|raw }}
</div>
{% endif %}

2
src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
View File

@ -6,6 +6,8 @@
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
{{ 'import.page_description'|trans }}
<ul>
{% for import in imports %}

2
src/Wallabag/ImportBundle/Resources/views/Instapaper/index.html.twig
View File

@ -6,7 +6,7 @@
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %}
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans }}</blockquote>

2
src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
View File

@ -6,7 +6,7 @@
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %}
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
{% if not has_consumer_key %}
<div class="card-panel red white-text">

2
src/Wallabag/ImportBundle/Resources/views/Readability/index.html.twig
View File

@ -6,7 +6,7 @@
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %}
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans }}</blockquote>

2
src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig
View File

@ -6,7 +6,7 @@
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %}
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans }}</blockquote>