Merge pull request #1941 from wallabag/v2-asynchronous-jobs

Use asynchronous jobs for imports

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index f4230734cf4e674d0c206fec20e47ce50812fbdd..65b708c77c262e2ca4d9f6c693e2d12d8f7f9032 100755 (executable)
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -174,7 +174,7 @@ div.pagination ul .next.disabled {
 
 footer.page-footer {
   margin-top: 10px;
-  padding-top: 10px;
+  padding-top: 0px;
 }
 
 footer .row {

diff --git a/docs/de/index.rst b/docs/de/index.rst
index 5311150fa04abcdd7670af7bc7d5fc58156301c1..d8cd8f396bbfe3e6baca7f48d51f0341ade171d9 100644 (file)
--- a/docs/de/index.rst
+++ b/docs/de/index.rst
@@ -17,6 +17,11 @@ Die Hauptdokumentation für diese Applikation ist in einigen Abschnitten organis
 * :ref:`user-docs`
 * :ref:`dev-docs`
 
+Die Dokumentation ist in anderen Sprachen verfügbar :
+
+* `Documentation in english <http://doc.wallabag.org/en/master/>`_
+* `Documentation en français <http://doc.wallabag.org/fr/master/>`_
+
 .. _user-docs:
 
 .. toctree::

diff --git a/docs/en/index.rst b/docs/en/index.rst
index 03025ef9247bb9015706b2b7c12401f8188bbd9f..bc3ce4c2bd251fcfd0cf6f619eb5e90fd44340d7 100644 (file)
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -17,6 +17,11 @@ The main documentation for this application is organized into a couple sections:
 * :ref:`user-docs`
 * :ref:`dev-docs`
 
+The documentation is available in other languages:
+
+* `Documentation en français <http://doc.wallabag.org/fr/master/>`_
+* `Deutsch Dokumentation <http://doc.wallabag.org/de/master/>`_
+
 .. _user-docs:
 
 .. toctree::

diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index 1e72dae782089f1ecd72cd7f72bba0acee83f7f7..095f1a69f061075c8d1a763d979e70a545afa3dc 100644 (file)
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -18,6 +18,11 @@ La documentation principale de cette application est découpée en plusieurs sec
 * :ref:`user-docs`
 * :ref:`dev-docs`
 
+La documentation est disponible dans d'autres langues :
+
+* `Documentation in english <http://doc.wallabag.org/en/master/>`_
+* `Deutsch Dokumentation <http://doc.wallabag.org/de/master/>`_
+
 .. _user-docs:
 
 .. toctree::

diff --git a/src/Wallabag/CoreBundle/Controller/FooterController.php b/src/Wallabag/CoreBundle/Controller/FooterController.php
deleted file mode 100644 (file)
index fd93c43..0000000
--- a/src/Wallabag/CoreBundle/Controller/FooterController.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-
-class FooterController extends Controller
-{
-    /**
-     * Display the footer.
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function indexAction()
-    {
-        $addonsUrl = $this->container->getParameter('addons_url');
-        $socialsUrl = $this->container->getParameter('socials_url');
-
-        return $this->render(
-            'WallabagCoreBundle::footer.html.twig',
-            [
-                'addonsUrl' => $addonsUrl,
-                'socialsUrl' => $socialsUrl,
-            ]
-        );
-    }
-}

diff --git a/src/Wallabag/CoreBundle/Resources/config/parameters.yml b/src/Wallabag/CoreBundle/Resources/config/parameters.yml
index abd9ab6893ae7ca28bb6a10aa79083f0cd055338..6068e84cd80081200549c00bd3006533d2818a0f 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/config/parameters.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/parameters.yml
@@ -6,7 +6,3 @@ parameters:
         google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche
         ios: https://itunes.apple.com/app/wallabag/id828331015?mt=8
         windows: https://www.microsoft.com/store/apps/wallabag/9nblggh11646
-    socials_url:
-        twitter: https://twitter.com/wallabagapp
-        google_plus: https://plus.google.com/+WallabagOrg/posts
-        facebook: https://facebook.com/Wallabag

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 2c4df867070dd582e55ca484b6dc1796b539de6a..c6818449660ea15fd7a756b1d964c74eefbbe4fe 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -41,7 +41,7 @@ menu:
 
 footer:
     wallabag:
-        elsewhere: 'Emportatz wallabag amb vosaultres'
+        elsewhere: 'Emportatz wallabag amb vosautres'
         social: 'Social'
         powered_by: 'propulsat per'
         about: 'A prepaus'

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 675168bbae601c51cb2ad3591803d5b2d2d51151..bec4b70fb318e3b3f5cffcea432aa57e9d7089c2 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -13,7 +13,13 @@
                 <li class="topPosF"><a href="#top" title="{{ 'entry.view.left_menu.back_to_top'|trans }}" class="tool top icon icon-arrow-up-thick"><span>{{ 'entry.view.left_menu.set_as_read'|trans }}</span></a></li>
                 <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li>
-                <li><a title="{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span></a></li>
+
+                {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %}
+                {% if entry.isArchived == 0 %}
+                    {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %}
+                {% endif %}
+
+                <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
                 <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
                 <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>

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 9b587c34a578cedb96e0691bb196fd90f51e5519..209e9e8965a66ff43c26df2cc769f114dd5b9fa2 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -61,10 +61,15 @@
             <div class="collapsible-body"></div>
         </li>
 
+        {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %}
+        {% if entry.isArchived == 0 %}
+            {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %}
+        {% endif %}
+
         <li class="bold hide-on-med-and-down">
-            <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
+            <a class="waves-effect collapsible-header" title="{{ markAsReadLabel|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
                 <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i>
-                <span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span>
+                <span>{{ markAsReadLabel|trans }}</span>
             </a>
             <div class="collapsible-body"></div>
         </li>

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig
deleted file mode 100644 (file)
index 7cb1996..0000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig
+++ /dev/null
@@ -1,41 +0,0 @@
-<footer class="page-footer cyan darken-2">
-    <div class="container">
-        <div class="row">
-            <div class="col l6 s12">
-                <h5 class="white-text">{{ 'footer.wallabag.elsewhere'|trans }}</h5>
-                <p class="grey-text text-lighten-4">
-                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.google_play }}" title="Android">
-                        <span class="icon-android"></span>
-                    </a>
-                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.ios }}" title="iOS">
-                        <span class="icon-apple"></span>
-                    </a>
-                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.firefox }}" title="Firefox">
-                        <span class="icon-firefox"></span>
-                    </a>
-                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.chrome }}" title="Chrome">
-                        <span class="icon-chrome"></span>
-                    </a>
-                </p>
-            </div>
-            <div class="col l4 offset-l2 s12">
-                <h5 class="white-text">{{ 'footer.wallabag.social'|trans }}</h5>
-                <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.twitter }}" title="Twitter">
-                    <span class="icon-twitter"></span>
-                </a>
-                <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.google_plus }}" title="Google+">
-                    <span class="icon-google-plus2"></span>
-                </a>
-                <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.facebook }}" title="Facebook">
-                    <span class="icon-facebook2"></span>
-                </a>
-            </div>
-        </div>
-    </div>
-    <div class="footer-copyright">
-        <div class="container">
-            <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
-            <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a>
-        </div>
-    </div>
-</footer>

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 23938b21ce7fd123a5b66526817af123dbb64528..df05e2a4890bd5dfd5d4aa751ec5dfbf46436540 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -119,5 +119,12 @@
 {% endblock %}
 
 {% block footer %}
-    {{ render(controller("WallabagCoreBundle:Footer:index")) }}
+    <footer class="page-footer cyan darken-2">
+        <div class="footer-copyright">
+            <div class="container">
+                <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
+                <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a>
+            </div>
+        </div>
+    </footer>
 {% endblock %}