diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-09-19 07:15:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-19 07:15:40 +0200 |
commit | da18a4682f124b02278860d23ac1d59dee995277 (patch) | |
tree | eabbe9da7203eea41e0cb0ec3c26b9b6599cf58f /src/Wallabag/CoreBundle/Resources/views | |
parent | 0ed8ce55b5caf2c88e8330afa83abef6c4aac9a4 (diff) | |
parent | 59b97fae996d8307b9d957d210d46200f6d206bf (diff) | |
download | wallabag-da18a4682f124b02278860d23ac1d59dee995277.tar.gz wallabag-da18a4682f124b02278860d23ac1d59dee995277.tar.zst wallabag-da18a4682f124b02278860d23ac1d59dee995277.zip |
Merge pull request #1941 from wallabag/v2-asynchronous-jobs
Use asynchronous jobs for imports
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
3 files changed, 26 insertions, 0 deletions
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 f89265d4..6446cf2c 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 | |||
@@ -44,6 +44,18 @@ | |||
44 | </div> | 44 | </div> |
45 | </fieldset> | 45 | </fieldset> |
46 | 46 | ||
47 | <fieldset class="w500p inline"> | ||
48 | <div class="row"> | ||
49 | {{ form_label(form.config.pocket_consumer_key) }} | ||
50 | {{ form_errors(form.config.pocket_consumer_key) }} | ||
51 | {{ form_widget(form.config.pocket_consumer_key) }} | ||
52 | <p> | ||
53 | » | ||
54 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | ||
55 | </p> | ||
56 | </div> | ||
57 | </fieldset> | ||
58 | |||
47 | {{ form_rest(form.config) }} | 59 | {{ form_rest(form.config) }} |
48 | </form> | 60 | </form> |
49 | 61 | ||
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 bf390e89..5330c353 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 | |||
@@ -62,6 +62,18 @@ | |||
62 | </div> | 62 | </div> |
63 | </div> | 63 | </div> |
64 | 64 | ||
65 | <div class="row"> | ||
66 | <div class="input-field col s12"> | ||
67 | {{ form_label(form.config.pocket_consumer_key) }} | ||
68 | {{ form_errors(form.config.pocket_consumer_key) }} | ||
69 | {{ form_widget(form.config.pocket_consumer_key) }} | ||
70 | <p> | ||
71 | » | ||
72 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | ||
73 | </p> | ||
74 | </div> | ||
75 | </div> | ||
76 | |||
65 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 77 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
66 | {{ form_rest(form.config) }} | 78 | {{ form_rest(form.config) }} |
67 | </form> | 79 | </form> |
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 72becfa4..df05e2a4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -19,6 +19,8 @@ | |||
19 | Materialize.toast('{{ flashMessage|trans }}', 4000); | 19 | Materialize.toast('{{ flashMessage|trans }}', 4000); |
20 | </script> | 20 | </script> |
21 | {% endfor %} | 21 | {% endfor %} |
22 | |||
23 | {{ render(controller("WallabagImportBundle:Import:checkQueue")) }} | ||
22 | {% endblock %} | 24 | {% endblock %} |
23 | 25 | ||
24 | {% block menu %} | 26 | {% block menu %} |