aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-09-30 10:21:33 +0200
committerGitHub <noreply@github.com>2016-09-30 10:21:33 +0200
commit555ed552ca974fde57d3c153e33b28c32fb3115e (patch)
tree51074ab8e0305b786c422577948fb8116368d138
parentfb479be3a0af95bba45c13b11e1f85bb9c753d25 (diff)
parent2ff9991a1dfac0d3463662b96f529aac70c66f76 (diff)
downloadwallabag-555ed552ca974fde57d3c153e33b28c32fb3115e.tar.gz
wallabag-555ed552ca974fde57d3c153e33b28c32fb3115e.tar.zst
wallabag-555ed552ca974fde57d3c153e33b28c32fb3115e.zip
Merge pull request #2318 from wallabag/refactor-templates
Removed duplicated templates files
-rw-r--r--src/Wallabag/CoreBundle/Controller/DeveloperController.php8
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php2
-rw-r--r--src/Wallabag/CoreBundle/Controller/RssController.php2
-rw-r--r--src/Wallabag/CoreBundle/Controller/StaticController.php6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig169
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig28
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig67
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig (renamed from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig (renamed from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig (renamed from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig (renamed from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig (renamed from src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig (renamed from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig (renamed from src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig (renamed from src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig (renamed from src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig (renamed from src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig)2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig (renamed from src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig37
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig23
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig63
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig69
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig26
26 files changed, 18 insertions, 494 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/DeveloperController.php b/src/Wallabag/CoreBundle/Controller/DeveloperController.php
index 63386db0..f3492b74 100644
--- a/src/Wallabag/CoreBundle/Controller/DeveloperController.php
+++ b/src/Wallabag/CoreBundle/Controller/DeveloperController.php
@@ -21,7 +21,7 @@ class DeveloperController extends Controller
21 { 21 {
22 $clients = $this->getDoctrine()->getRepository('WallabagApiBundle:Client')->findAll(); 22 $clients = $this->getDoctrine()->getRepository('WallabagApiBundle:Client')->findAll();
23 23
24 return $this->render('WallabagCoreBundle:Developer:index.html.twig', [ 24 return $this->render('@WallabagCore/themes/common/Developer/index.html.twig', [
25 'clients' => $clients, 25 'clients' => $clients,
26 ]); 26 ]);
27 } 27 }
@@ -52,14 +52,14 @@ class DeveloperController extends Controller
52 $this->get('translator')->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()]) 52 $this->get('translator')->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()])
53 ); 53 );
54 54
55 return $this->render('WallabagCoreBundle:Developer:client_parameters.html.twig', [ 55 return $this->render('@WallabagCore/themes/common/Developer/client_parameters.html.twig', [
56 'client_id' => $client->getPublicId(), 56 'client_id' => $client->getPublicId(),
57 'client_secret' => $client->getSecret(), 57 'client_secret' => $client->getSecret(),
58 'client_name' => $client->getName(), 58 'client_name' => $client->getName(),
59 ]); 59 ]);
60 } 60 }
61 61
62 return $this->render('WallabagCoreBundle:Developer:client.html.twig', [ 62 return $this->render('@WallabagCore/themes/common/Developer/client.html.twig', [
63 'form' => $clientForm->createView(), 63 'form' => $clientForm->createView(),
64 ]); 64 ]);
65 } 65 }
@@ -96,6 +96,6 @@ class DeveloperController extends Controller
96 */ 96 */
97 public function howtoFirstAppAction() 97 public function howtoFirstAppAction()
98 { 98 {
99 return $this->render('WallabagCoreBundle:Developer:howto_app.html.twig'); 99 return $this->render('@WallabagCore/themes/common/Developer/howto_app.html.twig');
100 } 100 }
101} 101}
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 40111af0..3b28e635 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -531,7 +531,7 @@ class EntryController extends Controller
531 } 531 }
532 532
533 return $this->render( 533 return $this->render(
534 '@WallabagCore/themes/share.html.twig', 534 '@WallabagCore/themes/common/Entry/share.html.twig',
535 ['entry' => $entry] 535 ['entry' => $entry]
536 ); 536 );
537 } 537 }
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php
index 2118885c..38e3b5a0 100644
--- a/src/Wallabag/CoreBundle/Controller/RssController.php
+++ b/src/Wallabag/CoreBundle/Controller/RssController.php
@@ -87,7 +87,7 @@ class RssController extends Controller
87 $perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit'); 87 $perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit');
88 $entries->setMaxPerPage($perPage); 88 $entries->setMaxPerPage($perPage);
89 89
90 return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', [ 90 return $this->render('@WallabagCore/themes/common/Entry/entries.xml.twig', [
91 'type' => $type, 91 'type' => $type,
92 'entries' => $entries, 92 'entries' => $entries,
93 ]); 93 ]);
diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php
index 2a57f06f..82714217 100644
--- a/src/Wallabag/CoreBundle/Controller/StaticController.php
+++ b/src/Wallabag/CoreBundle/Controller/StaticController.php
@@ -15,7 +15,7 @@ class StaticController extends Controller
15 $addonsUrl = $this->container->getParameter('addons_url'); 15 $addonsUrl = $this->container->getParameter('addons_url');
16 16
17 return $this->render( 17 return $this->render(
18 'WallabagCoreBundle:Static:howto.html.twig', 18 '@WallabagCore/themes/common/Static/howto.html.twig',
19 ['addonsUrl' => $addonsUrl] 19 ['addonsUrl' => $addonsUrl]
20 ); 20 );
21 } 21 }
@@ -26,7 +26,7 @@ class StaticController extends Controller
26 public function aboutAction() 26 public function aboutAction()
27 { 27 {
28 return $this->render( 28 return $this->render(
29 'WallabagCoreBundle:Static:about.html.twig', 29 '@WallabagCore/themes/common/Static/about.html.twig',
30 [ 30 [
31 'version' => $this->getParameter('wallabag_core.version'), 31 'version' => $this->getParameter('wallabag_core.version'),
32 'paypal_url' => $this->getParameter('wallabag_core.paypal_url'), 32 'paypal_url' => $this->getParameter('wallabag_core.paypal_url'),
@@ -40,7 +40,7 @@ class StaticController extends Controller
40 public function quickstartAction() 40 public function quickstartAction()
41 { 41 {
42 return $this->render( 42 return $this->render(
43 'WallabagCoreBundle:Static:quickstart.html.twig', 43 '@WallabagCore/themes/common/Static/quickstart.html.twig',
44 [] 44 []
45 ); 45 );
46 } 46 }
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 1554cce4..ffc5bec6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -1,7 +1,7 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %} 3{% block title %}
4 {% include "@WallabagCore/themes/_title.html.twig" %} 4 {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
5{% endblock %} 5{% endblock %}
6 6
7{% block content %} 7{% block content %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
deleted file mode 100644
index 918249dc..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
+++ /dev/null
@@ -1,169 +0,0 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3{% block title %}{{ 'about.page_title'|trans }}{% endblock %}
4
5{% block content %}
6 <h2>{{ 'about.top_menu.who_behind_wallabag'|trans }}</h2>
7
8 <dl>
9 <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt>
10 <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
11 <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
12 <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
13
14 <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt>
15
16 <dt>{{ 'about.who_behind_wallabag.project_website'|trans }}</dt>
17 <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
18
19 <dt>{{ 'about.who_behind_wallabag.license'|trans }}: <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dt>
20
21 <dt>{{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}</dt>
22 </dl>
23
24 <h2>{{ 'about.top_menu.getting_help'|trans }}</h2>
25
26 <dl>
27 <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
28 <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd>
29 <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd>
30
31 <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
32 <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
33 </dl>
34
35 <h2>{{ 'about.top_menu.helping'|trans }}</h2>
36
37 <p>{{ 'about.helping.description'|trans }}</p>
38
39 <dl>
40 <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd>
41 <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
42 </dl>
43
44 <h2>{{ 'about.top_menu.contributors'|trans }}</h2>
45 <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{{ 'about.contributors.description'|trans }}</a></p>
46
47 <h2>{{ 'about.top_menu.third_party'|trans }}</h2>
48 <p>{{ 'about.third_party.description'|trans }}</p>
49 <table class="striped">
50 <tr>
51 <th>{{ 'about.third_party.package'|trans }}</th>
52 <th>{{ 'about.third_party.license'|trans }}</th>
53 </tr>
54 <tr><td>behat/transliterator</td><td>Artistic 1.0</td></tr>
55 <tr><td>CraueConfigBundle</td><td>MIT</td></tr>
56 <tr><td>doctrine/annotations</td><td>MIT</td></tr>
57 <tr><td>doctrine/cache</td><td>MIT</td></tr>
58 <tr><td>doctrine/collections</td><td>MIT</td></tr>
59 <tr><td>doctrine/common</td><td>MIT</td></tr>
60 <tr><td>doctrine/dbal</td><td>MIT</td></tr>
61 <tr><td>doctrine/doctrine-bundle</td><td>MIT</td></tr>
62 <tr><td>doctrine/doctrine-cache-bundle</td><td>MIT</td></tr>
63 <tr><td>doctrine/doctrine-migrations-bundle</td><td>MIT</td></tr>
64 <tr><td>doctrine/inflector</td><td>MIT</td></tr>
65 <tr><td>doctrine/instantiator</td><td>MIT</td></tr>
66 <tr><td>doctrine/lexer</td><td>MIT</td></tr>
67 <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr>
68 <tr><td>doctrine/orm</td><td>MIT</td></tr>
69 <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr>
70 <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr>
71 <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr>
72 <tr><td>friendsofsymfony/user-bundle</td><td>MIT</td></tr>
73 <tr><td>gedmo/doctrine-extensions</td><td>MIT</td></tr>
74 <tr><td>grandt/binstring</td><td>LGPL-2.1</td></tr>
75 <tr><td>grandt/phpepub</td><td>LGPL-2.1</td></tr>
76 <tr><td>grandt/phpresizegif</td><td>LGPL-2.1</td></tr>
77 <tr><td>grandt/phpzipmerge</td><td>LGPL-2.1</td></tr>
78 <tr><td>grandt/relativepath</td><td>LGPL-2.1</td></tr>
79 <tr><td>guzzlehttp/guzzle</td><td>MIT</td></tr>
80 <tr><td>guzzlehttp/ringphp</td><td>MIT</td></tr>
81 <tr><td>guzzlehttp/streams</td><td>MIT</td></tr>
82 <tr><td>hoa/compiler</td><td>BSD-3-Clause</td></tr>
83 <tr><td>hoa/consistency</td><td>BSD-3-Clause</td></tr>
84 <tr><td>hoa/event</td><td>BSD-3-Clause</td></tr>
85 <tr><td>hoa/exception</td><td>BSD-3-Clause</td></tr>
86 <tr><td>hoa/file</td><td>BSD-3-Clause</td></tr>
87 <tr><td>hoa/iterator</td><td>BSD-3-Clause</td></tr>
88 <tr><td>hoa/math</td><td>BSD-3-Clause</td></tr>
89 <tr><td>hoa/protocol</td><td>BSD-3-Clause</td></tr>
90 <tr><td>hoa/regex</td><td>BSD-3-Clause</td></tr>
91 <tr><td>hoa/ruler</td><td>BSD-3-Clausev
92 <tr><td>hoa/stream</td><td>BSD-3-Clause</td></tr>
93 <tr><td>hoa/ustring</td><td>BSD-3-Clause</td></tr>
94 <tr><td>hoa/visitor</td><td>BSD-3-Clause</td></tr>
95 <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
96 <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
97 <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
98 <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
99 <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
100 <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
101 <tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
102 <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>
103 <tr><td>jms/metadata</td><td>Apache</td></tr>
104 <tr><td>jms/parser-lib</td><td>Apache2</td></tr>
105 <tr><td>jms/serializer</td><td>Apache2</td></tr>
106 <tr><td>jms/serializer-bundle</td><td>Apache2</td></tr>
107 <tr><td>kphoen/rulerz</td><td>MIT</td></tr>
108 <tr><td>kphoen/rulerz-bundle</td><td>MIT</td></tr>
109 <tr><td>kriswallsmith/assetic</td><td>MIT</td></tr>
110 <tr><td>lexik/form-filter-bundle</td><td>MIT</td></tr>
111 <tr><td>liip/theme-bundle</td><td>MIT</td></tr>
112 <tr><td>mgargano/simplehtmldom</td><td>MIT</td></tr>
113 <tr><td>michelf/php-markdown</td><td>BSD-3-Clause</td></tr>
114 <tr><td>monolog/monolog</td><td>MIT</td></tr>
115 <tr><td>neitanod/forceutf8</td><td>BSD-3-Clause</td></tr>
116 <tr><td>nelmio/api-doc-bundle</td><td>MIT</td></tr>
117 <tr><td>nelmio/cors-bundle</td><td>MIT</td></tr>
118 <tr><td>ocramius/proxy-manager</td><td>MIT</td></tr>
119 <tr><td>pagerfanta/pagerfanta</td><td>MIT</td></tr>
120 <tr><td>paragonie/random_compat</td><td>MIT</td></tr>
121 <tr><td>phpcollection/phpcollection</td><td>Apache2</td></tr>
122 <tr><td>phpoption/phpoption</td><td>Apache2</td></tr>
123 <tr><td>phpzip/phpzip</td><td>LGPL-2.1</td></tr>
124 <tr><td>psr/log</td><td>MIT</td></tr>
125 <tr><td>react/promise</td><td>MIT</td></tr>
126 <tr><td>scheb/two-factor-bundle</td><td>MIT</td></tr>
127 <tr><td>sensio/distribution-bundle</td><td>MIT</td></tr>
128 <tr><td>sensio/framework-extra-bundle</td><td>MIT</td></tr>
129 <tr><td>sensiolabs/security-checker</td><td>MIT</td></tr>
130 <tr><td>simplepie/simplepie</td><td>BSD-3-Clause</td></tr>
131 <tr><td>smalot/pdfparser</td><td>GPL-3.0</td></tr>
132 <tr><td>sonata-project/google-authenticator</td><td>MIT</td></tr>
133 <tr><td>stof/doctrine-extensions-bundle</td><td>MIT</td></tr>
134 <tr><td>swiftmailer/swiftmailer</td><td>MIT</td></tr>
135 <tr><td>symfony/assetic-bundle</td><td>MIT</td></tr>
136 <tr><td>symfony/monolog-bundle</td><td>MIT</td></tr>
137 <tr><td>All of Symfony</td><td>MIT-licenced</td></tr>
138 <tr><td>tecnickcom/tcpdf</td><td>LGPLv3</td></tr>
139 <tr><td>twig/extensions</td><td>MIT</td></tr>
140 <tr><td>twig/twig</td><td>BSD-3-Clause</td></tr>
141 <tr><td>wallabag/php-mobi</td><td>Apache-2.0</td></tr>
142 <tr><td>willdurand/hateoas</td><td>MIT</td></tr>
143 <tr><td>willdurand/hateoas-bundle</td><td>MIT</td></tr>
144 <tr><td>willdurand/jsonp-callback-validator</td><td>MIT</td></tr>
145 <tr><td>willdurand/negotiation</td><td>MIT</td></tr>
146 <tr><td>zendframework/zend-code</td><td>BSD-3-Clause</td></tr>
147 <tr><td>zendframework/zend-eventmanager</td><td>BSD-3-Clause</td></tr>
148 <tr><td>doctrine/data-fixtures</td><td>MIT</td></tr>
149 <tr><td>doctrine/doctrine-fixtures-bundle</td><td>MIT</td></tr>
150 <tr><td>phpdocumentor/reflection-docblock</td><td>MIT</td></tr>
151 <tr><td>phpspec/prophecy</td><td>MIT</td></tr>
152 <tr><td>phpunit/php-code-coverage</td><td>BSD-3-Clause</td></tr>
153 <tr><td>phpunit/php-file-iterator</td><td>BSD-3-Clause</td></tr>
154 <tr><td>phpunit/php-text-template</td><td>BSD-3-Clause</td></tr>
155 <tr><td>phpunit/php-timer</td><td>BSD-3-Clause</td></tr>
156 <tr><td>phpunit/php-token-stream</td><td>BSD-3-Clause</td></tr>
157 <tr><td>phpunit/phpunit</td><td>BSD-3-Clause</td></tr>
158 <tr><td>phpunit/phpunit-mock-objects</td><td>BSD-3-Clause</td></tr>
159 <tr><td>sebastian/comparator</td><td>BSD-3-Clause</td></tr>
160 <tr><td>sebastian/diff</td><td>BSD-3-Clause</td></tr>
161 <tr><td>sebastian/environment</td><td>BSD-3-Clause</td></tr>
162 <tr><td>sebastian/exporter</td><td>BSD-3-Clause</td></tr>
163 <tr><td>sebastian/global-state</td><td>BSD-3-Clause</td></tr>
164 <tr><td>sebastian/recursion-context</td><td>BSD-3-Clause</td></tr>
165 <tr><td>sebastian/version</td><td>BSD-3-Clause</td></tr>
166 <tr><td>sensio/generator-bundle</td><td>MIT</td></tr>
167 <tr><td>symfony/phpunit-bridge</td><td>MIT</td></tr>
168 </table>
169{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
deleted file mode 100644
index b529a0ac..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
+++ /dev/null
@@ -1,28 +0,0 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3{% block title %}{{ 'howto.page_title'|trans }}{% endblock %}
4
5{% block content %}
6 <h2>{{ 'howto.page_title'|trans }}</h2>
7
8 <p>{{ 'howto.page_description'|trans }}</p>
9 <ul>
10 <li><a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a></li>
11 </ul>
12 <h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3>
13 <ul>
14 <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
15 <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
16 </ul>
17 <h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3>
18 <ul>
19 <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
20 <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
21 <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
22 </ul>
23 <h3>{{ 'howto.top_menu.bookmarklet'|trans }}</h3>
24 <p>
25 {{ 'howto.bookmarklet.description'|trans }}
26 {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
27
28{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
deleted file mode 100644
index ea1c1cbe..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
+++ /dev/null
@@ -1,67 +0,0 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %}
4
5{% block content %}
6
7 <h3>{{ 'quickstart.intro.title'|trans }}</h3>
8 <p>{{ 'quickstart.intro.paragraph_1'|trans }}</p>
9 <p>{{ 'quickstart.intro.paragraph_2'|trans }}</p>
10
11 <h4>{{ 'quickstart.configure.title'|trans }}</h4>
12 <ul>
13 <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li>
14 <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li>
15 <li><a href="{{ path('config') }}#set5">{{ 'quickstart.configure.tagging_rules'|trans }}</a></li>
16 </ul>
17
18 {% if is_granted('ROLE_SUPER_ADMIN') %}
19 <h4>{{ 'quickstart.admin.title'|trans }}</h4>
20 <p>{{ 'quickstart.admin.description'|trans }}</p>
21 <ul>
22 <li><a href="{{ path('config') }}#set6">{{ 'quickstart.admin.new_user'|trans }}</a></li>
23 <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{{ 'quickstart.admin.analytics'|trans }}</a></li>
24 <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{{ 'quickstart.admin.sharing'|trans }}</a></li>
25 <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{{ 'quickstart.admin.export'|trans }}</a></li>
26 <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{{ 'quickstart.admin.import'|trans }}</a></li>
27 </ul>
28 {% endif %}
29
30 <h4>{{ 'quickstart.first_steps.title'|trans }}</h4>
31 <ul>
32 <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li>
33 <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li>
34 </ul>
35
36 <h4>{{ 'quickstart.migrate.title'|trans }}</h4>
37 <p>{{ 'quickstart.migrate.description'|trans }}</p>
38 <ul>
39 <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li>
40 <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li>
41 <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li>
42 <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li>
43 </ul>
44
45 <h4>{{ 'quickstart.developer.title'|trans }}</h4>
46 <ul>
47 <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
48 </ul>
49
50 <h4>{{ 'quickstart.docs.title'|trans }}</h4>
51 <ul>
52 <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
53 <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
54 <li><a href="http://doc.wallabag.org/en/master/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
55 <li><a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
56 <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
57 </ul>
58
59 <h4>{{ 'quickstart.support.title'|trans }}</h4>
60 <p>{{ 'quickstart.support.description'|trans }}</p>
61 <ul>
62 <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li>
63 <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li>
64 <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li>
65 </ul>
66
67{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
index 8a5da71a..8a5da71a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig
index b498cceb..b498cceb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig
index acbc2c88..acbc2c88 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
index 3430c0d4..3430c0d4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
index d1c2f203..d1c2f203 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
index 288bb54f..288bb54f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
index b82b3d3d..b82b3d3d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig
new file mode 100644
index 00000000..631bcb88
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig
@@ -0,0 +1,6 @@
1Hello {{username}}!
2
3To reset your password - please visit {{confirmationUrl}}
4
5Regards,
6Wallabag bot
diff --git a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig
index 966a84db..966a84db 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
index d0b94279..d0b94279 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
index 6a177d6b..67a10190 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
@@ -35,7 +35,7 @@
35 <div class="col s12"> 35 <div class="col s12">
36 <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5> 36 <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5>
37 {{ 'howto.bookmarklet.description'|trans }} 37 {{ 'howto.bookmarklet.description'|trans }}
38 {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} 38 {% include '@WallabagCore/themes/common/Static/_bookmarklet.html.twig' %}
39 </div> 39 </div>
40 40
41 </div> 41 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
index 8cbf4ab4..8cbf4ab4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig
deleted file mode 100644
index 8a5da71a..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig
+++ /dev/null
@@ -1,37 +0,0 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}
4
5{% block content %}
6<div class="row">
7 <div class="col s12">
8 <div class="card-panel settings">
9
10 <div class="row">
11 <p>{{ 'developer.client.page_description'|trans }}</p>
12 {{ form_start(form) }}
13 {{ form_errors(form) }}
14
15 <div class="input-field col s12">
16 {{ form_label(form.name) }}
17 {{ form_errors(form.name) }}
18 {{ form_widget(form.name) }}
19 </div>
20
21 <div class="input-field col s12">
22 {{ form_label(form.redirect_uris) }}
23 {{ form_errors(form.redirect_uris) }}
24 {{ form_widget(form.redirect_uris) }}
25 </div>
26
27 <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client.action_back'|trans }}</a>
28 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
29
30 {{ form_rest(form) }}
31 </div>
32
33 </div>
34 </div>
35</div>
36
37{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
deleted file mode 100644
index b498cceb..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %}
4
5{% block content %}
6<div class="row">
7 <div class="col s12">
8 <div class="card-panel settings">
9 <div class="row">
10 <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
11 <ul>
12 <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
13 <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
14 <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
15 </ul>
16
17 <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a>
18 <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a>
19 </div>
20 </div>
21 </div>
22</div>
23{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig
deleted file mode 100644
index acbc2c88..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig
+++ /dev/null
@@ -1,63 +0,0 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3{% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %}
4
5{% block css %}
6 {{ parent() }}
7 <link rel="stylesheet" href="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/themes/prism-dark.min.css') }}">
8{% endblock %}
9
10{% block content %}
11<div class="row">
12 <div class="col s12">
13 <div class="card-panel settings">
14
15 <div class="row">
16 <p>{{ 'developer.howto.description.paragraph_1'|trans|raw }}</p>
17 <p>{{ 'developer.howto.description.paragraph_2'|trans }}</p>
18 <p>{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}</p>
19 <p>{{ 'developer.howto.description.paragraph_4'|trans }}</p>
20 <p>
21 <pre><code class="language-bash">http POST http://v2.wallabag.org/oauth/v2/token \
22 grant_type=password \
23 client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \
24 client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \
25 username=yourUsername \
26 password=yourPassw0rd</code></pre>
27 </p>
28 <p>{{ 'developer.howto.description.paragraph_5'|trans }}</p>
29 <p>
30 <pre><code class="language-bash">HTTP/1.1 200 OK
31Cache-Control: no-store, private
32Connection: close
33Content-Type: application/json
34Date: Tue, 06 Oct 2015 18:24:03 GMT
35Host: localhost:8000
36Pragma: no-cache
37X-Debug-Token: be00a1
38X-Debug-Token-Link: /profiler/be00a1
39X-Powered-By: PHP/5.5.9-1ubuntu4.13
40{
41 "access_token": "ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw",
42 "expires_in": 3600,
43 "refresh_token": "ODBjODU1NWUwNmUzZTBkNDQ5YWVlZTVlMjQ2Y2I0OWM2NTM1ZGM2M2Y3MDhjMTViM2U2MzYxYzRkMDk5ODRlZg",
44 "scope": null,
45 "token_type": "bearer"
46}</code></pre>
47 </p>
48 <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p>
49 <p>
50 <pre><code class="language-bash">http GET http://v2.wallabag.org/api/entries.json \
51 "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre>
52 </p>
53 <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p>
54 <p>{{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}</p>
55 <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.howto.back'|trans }}</a></p>
56 </div>
57
58 </div>
59 </div>
60</div>
61<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/prism.min.js') }}"></script>
62<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/components/prism-bash.min.js') }}"></script>
63{% endblock %}
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
deleted file mode 100644
index 3430c0d4..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
+++ /dev/null
@@ -1,69 +0,0 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3{% block title %}{{ 'developer.page_title'|trans }}{% endblock %}
4
5{% block content %}
6<div class="row">
7 <div class="col s12">
8 <div class="card-panel settings">
9
10 <div class="row">
11 <h3>{{ 'developer.welcome_message'|trans }}</h3>
12
13 <h4>{{ 'developer.documentation'|trans }}</h4>
14
15 <ul>
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/master/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li>
18 <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li>
19 </ul>
20
21 <h4>{{ 'developer.clients.title'|trans }}</h4>
22 <ul>
23 <li><a href="{{ path('developer_create_client') }}">{{ 'developer.clients.create_new'|trans }}</a></li>
24 </ul>
25
26 <h4>{{ 'developer.existing_clients.title'|trans }}</h4>
27 {% if clients %}
28 <ul class="collapsible" data-collapsible="expandable">
29 {% for client in clients %}
30 <li>
31 <div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div>
32 <div class="collapsible-body">
33 <table class="striped">
34 <tr>
35 <td>{{ 'developer.existing_clients.field_id'|trans }}</td>
36 <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td>
37 </tr>
38 <tr>
39 <td>{{ 'developer.existing_clients.field_secret'|trans }}</td>
40 <td><strong><code>{{ client.secret }}</code></strong></td>
41 </tr>
42 <tr>
43 <td>{{ 'developer.existing_clients.field_uris'|trans }}</td>
44 <td><strong><code>{{ client.redirectUris|json_encode() }}</code></strong></td>
45 </tr>
46 <tr>
47 <td>{{ 'developer.existing_clients.field_grant_types'|trans }}</td>
48 <td><strong><code>{{ client.allowedGrantTypes|json_encode() }}</code></strong></td>
49 </tr>
50 </table>
51 <p>
52 {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
53 {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
54 <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
55 </p>
56 </div>
57 </li>
58 {% endfor %}
59 </ul>
60 {% else %}
61 {{ 'developer.existing_clients.no_client'|trans }}
62 {% endif %}
63 </div>
64
65 </div>
66 </div>
67</div>
68
69{% endblock %}
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 806a4eef..e889dea8 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
@@ -1,7 +1,7 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %} 3{% block title %}
4 {% include "@WallabagCore/themes/_title.html.twig" %} 4 {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
5{% endblock %} 5{% endblock %}
6 6
7{% block content %} 7{% block content %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
deleted file mode 100644
index 288bb54f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
+++ /dev/null
@@ -1,26 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">
3 <channel>
4 <title>wallabag — {{type}} feed</title>
5 <link>{{ url('unread') }}</link>
6 <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate>
7 <generator>wallabag</generator>
8 <description>wallabag {{type}} elements</description>
9
10 {% for entry in entries %}
11
12 <item>
13 <title><![CDATA[{{ entry.title }}]]></title>
14 <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
15 <link>{{ entry.url }}</link>
16 <guid>{{ entry.url }}</guid>
17 <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
18 <description>
19 <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]>
20 </description>
21 </item>
22
23 {% endfor %}
24
25 </channel>
26</rss>