From 2ff9991a1dfac0d3463662b96f529aac70c66f76 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 30 Sep 2016 09:38:08 +0200 Subject: [PATCH] Removed duplicated templates files --- .../Controller/DeveloperController.php | 8 +- .../CoreBundle/Controller/EntryController.php | 2 +- .../CoreBundle/Controller/RssController.php | 2 +- .../Controller/StaticController.php | 6 +- .../themes/baggy/Entry/entries.html.twig | 2 +- .../views/themes/baggy/Static/about.html.twig | 169 ------------------ .../views/themes/baggy/Static/howto.html.twig | 28 --- .../themes/baggy/Static/quickstart.html.twig | 67 ------- .../Developer/client.html.twig | 0 .../Developer/client_parameters.html.twig | 0 .../Developer/howto_app.html.twig | 0 .../Developer/index.html.twig | 0 .../{ => common/Entry}/_title.html.twig | 0 .../{baggy => common}/Entry/entries.xml.twig | 0 .../themes/{ => common/Entry}/share.html.twig | 0 .../common/Mail/forgotPassword.txt.twig | 6 + .../common/Static}/_bookmarklet.html.twig | 0 .../Static/about.html.twig | 0 .../Static/howto.html.twig | 2 +- .../Static/quickstart.html.twig | 0 .../material/Developer/client.html.twig | 37 ---- .../Developer/client_parameters.html.twig | 23 --- .../material/Developer/howto_app.html.twig | 63 ------- .../themes/material/Developer/index.html.twig | 69 ------- .../themes/material/Entry/entries.html.twig | 2 +- .../themes/material/Entry/entries.xml.twig | 26 --- 26 files changed, 18 insertions(+), 494 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig rename src/Wallabag/CoreBundle/Resources/views/themes/{baggy => common}/Developer/client.html.twig (100%) rename src/Wallabag/CoreBundle/Resources/views/themes/{baggy => common}/Developer/client_parameters.html.twig (100%) rename src/Wallabag/CoreBundle/Resources/views/themes/{baggy => common}/Developer/howto_app.html.twig (100%) rename src/Wallabag/CoreBundle/Resources/views/themes/{baggy => common}/Developer/index.html.twig (100%) rename src/Wallabag/CoreBundle/Resources/views/themes/{ => common/Entry}/_title.html.twig (100%) rename src/Wallabag/CoreBundle/Resources/views/themes/{baggy => common}/Entry/entries.xml.twig (100%) rename src/Wallabag/CoreBundle/Resources/views/themes/{ => common/Entry}/share.html.twig (100%) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig rename src/Wallabag/CoreBundle/Resources/views/{ => themes/common/Static}/_bookmarklet.html.twig (100%) rename src/Wallabag/CoreBundle/Resources/views/themes/{material => common}/Static/about.html.twig (100%) rename src/Wallabag/CoreBundle/Resources/views/themes/{material => common}/Static/howto.html.twig (95%) rename src/Wallabag/CoreBundle/Resources/views/themes/{material => common}/Static/quickstart.html.twig (100%) delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig 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 { $clients = $this->getDoctrine()->getRepository('WallabagApiBundle:Client')->findAll(); - return $this->render('WallabagCoreBundle:Developer:index.html.twig', [ + return $this->render('@WallabagCore/themes/common/Developer/index.html.twig', [ 'clients' => $clients, ]); } @@ -52,14 +52,14 @@ class DeveloperController extends Controller $this->get('translator')->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()]) ); - return $this->render('WallabagCoreBundle:Developer:client_parameters.html.twig', [ + return $this->render('@WallabagCore/themes/common/Developer/client_parameters.html.twig', [ 'client_id' => $client->getPublicId(), 'client_secret' => $client->getSecret(), 'client_name' => $client->getName(), ]); } - return $this->render('WallabagCoreBundle:Developer:client.html.twig', [ + return $this->render('@WallabagCore/themes/common/Developer/client.html.twig', [ 'form' => $clientForm->createView(), ]); } @@ -96,6 +96,6 @@ class DeveloperController extends Controller */ public function howtoFirstAppAction() { - return $this->render('WallabagCoreBundle:Developer:howto_app.html.twig'); + return $this->render('@WallabagCore/themes/common/Developer/howto_app.html.twig'); } } 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 } return $this->render( - '@WallabagCore/themes/share.html.twig', + '@WallabagCore/themes/common/Entry/share.html.twig', ['entry' => $entry] ); } 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 $perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit'); $entries->setMaxPerPage($perPage); - return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', [ + return $this->render('@WallabagCore/themes/common/Entry/entries.xml.twig', [ 'type' => $type, 'entries' => $entries, ]); 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 $addonsUrl = $this->container->getParameter('addons_url'); return $this->render( - 'WallabagCoreBundle:Static:howto.html.twig', + '@WallabagCore/themes/common/Static/howto.html.twig', ['addonsUrl' => $addonsUrl] ); } @@ -26,7 +26,7 @@ class StaticController extends Controller public function aboutAction() { return $this->render( - 'WallabagCoreBundle:Static:about.html.twig', + '@WallabagCore/themes/common/Static/about.html.twig', [ 'version' => $this->getParameter('wallabag_core.version'), 'paypal_url' => $this->getParameter('wallabag_core.paypal_url'), @@ -40,7 +40,7 @@ class StaticController extends Controller public function quickstartAction() { return $this->render( - 'WallabagCoreBundle:Static:quickstart.html.twig', + '@WallabagCore/themes/common/Static/quickstart.html.twig', [] ); } 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 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% include "@WallabagCore/themes/_title.html.twig" %} + {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} {% endblock %} {% 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 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'about.page_title'|trans }}{% endblock %} - -{% block content %} -

{{ 'about.top_menu.who_behind_wallabag'|trans }}

- -
-
{{ 'about.who_behind_wallabag.developped_by'|trans }}
-
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
-
Thomas Citharel — {{ 'about.who_behind_wallabag.website'|trans }}
-
Jérémy Benoist — {{ 'about.who_behind_wallabag.website'|trans }}
- -
{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}
- -
{{ 'about.who_behind_wallabag.project_website'|trans }}
-
https://www.wallabag.org
- -
{{ 'about.who_behind_wallabag.license'|trans }}: MIT
- -
{{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}
-
- -

{{ 'about.top_menu.getting_help'|trans }}

- -
-
{{ 'about.getting_help.documentation'|trans }}
-
english
-
français
- -
{{ 'about.getting_help.bug_reports'|trans }}
-
{{ 'about.getting_help.support'|trans|raw }}
-
- -

{{ 'about.top_menu.helping'|trans }}

- -

{{ 'about.helping.description'|trans }}

- -
-
{{ 'about.helping.by_contributing_2'|trans }} {{ 'about.helping.by_contributing'|trans }}
-
{{ 'about.helping.by_paypal'|trans }}
-
- -

{{ 'about.top_menu.contributors'|trans }}

-

{{ 'about.contributors.description'|trans }}

- -

{{ 'about.top_menu.third_party'|trans }}

-

{{ 'about.third_party.description'|trans }}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ 'about.third_party.package'|trans }}{{ 'about.third_party.license'|trans }}
behat/transliteratorArtistic 1.0
CraueConfigBundleMIT
doctrine/annotationsMIT
doctrine/cacheMIT
doctrine/collectionsMIT
doctrine/commonMIT
doctrine/dbalMIT
doctrine/doctrine-bundleMIT
doctrine/doctrine-cache-bundleMIT
doctrine/doctrine-migrations-bundleMIT
doctrine/inflectorMIT
doctrine/instantiatorMIT
doctrine/lexerMIT
doctrine/migrationsLGPL-2.1
doctrine/ormMIT
friendsofsymfony/oauth-server-bundleMIT
friendsofsymfony/oauth2-phpMIT
friendsofsymfony/rest-bundleMIT
friendsofsymfony/user-bundleMIT
gedmo/doctrine-extensionsMIT
grandt/binstringLGPL-2.1
grandt/phpepubLGPL-2.1
grandt/phpresizegifLGPL-2.1
grandt/phpzipmergeLGPL-2.1
grandt/relativepathLGPL-2.1
guzzlehttp/guzzleMIT
guzzlehttp/ringphpMIT
guzzlehttp/streamsMIT
hoa/compilerBSD-3-Clause
hoa/consistencyBSD-3-Clause
hoa/eventBSD-3-Clause
hoa/exceptionBSD-3-Clause
hoa/fileBSD-3-Clause
hoa/iteratorBSD-3-Clause
hoa/mathBSD-3-Clause
hoa/protocolBSD-3-Clause
hoa/regexBSD-3-Clause
hoa/rulerBSD-3-Clausev -
hoa/streamBSD-3-Clause
hoa/ustringBSD-3-Clause
hoa/visitorBSD-3-Clause
hoa/zformatBSD-3-Clause
htmlawed/htmlawedGPL-2.0+ or LGPL-3.0
incenteev/composer-parameter-handlerMIT
j0k3r/grabyAGPL-3.0
j0k3r/graby-site-configAGPL-3.0
j0k3r/php-readabilityApache-2.0
j0k3r/safecurlMIT
jdorn/sql-formatterMIT
jms/metadataApache
jms/parser-libApache2
jms/serializerApache2
jms/serializer-bundleApache2
kphoen/rulerzMIT
kphoen/rulerz-bundleMIT
kriswallsmith/asseticMIT
lexik/form-filter-bundleMIT
liip/theme-bundleMIT
mgargano/simplehtmldomMIT
michelf/php-markdownBSD-3-Clause
monolog/monologMIT
neitanod/forceutf8BSD-3-Clause
nelmio/api-doc-bundleMIT
nelmio/cors-bundleMIT
ocramius/proxy-managerMIT
pagerfanta/pagerfantaMIT
paragonie/random_compatMIT
phpcollection/phpcollectionApache2
phpoption/phpoptionApache2
phpzip/phpzipLGPL-2.1
psr/logMIT
react/promiseMIT
scheb/two-factor-bundleMIT
sensio/distribution-bundleMIT
sensio/framework-extra-bundleMIT
sensiolabs/security-checkerMIT
simplepie/simplepieBSD-3-Clause
smalot/pdfparserGPL-3.0
sonata-project/google-authenticatorMIT
stof/doctrine-extensions-bundleMIT
swiftmailer/swiftmailerMIT
symfony/assetic-bundleMIT
symfony/monolog-bundleMIT
All of SymfonyMIT-licenced
tecnickcom/tcpdfLGPLv3
twig/extensionsMIT
twig/twigBSD-3-Clause
wallabag/php-mobiApache-2.0
willdurand/hateoasMIT
willdurand/hateoas-bundleMIT
willdurand/jsonp-callback-validatorMIT
willdurand/negotiationMIT
zendframework/zend-codeBSD-3-Clause
zendframework/zend-eventmanagerBSD-3-Clause
doctrine/data-fixturesMIT
doctrine/doctrine-fixtures-bundleMIT
phpdocumentor/reflection-docblockMIT
phpspec/prophecyMIT
phpunit/php-code-coverageBSD-3-Clause
phpunit/php-file-iteratorBSD-3-Clause
phpunit/php-text-templateBSD-3-Clause
phpunit/php-timerBSD-3-Clause
phpunit/php-token-streamBSD-3-Clause
phpunit/phpunitBSD-3-Clause
phpunit/phpunit-mock-objectsBSD-3-Clause
sebastian/comparatorBSD-3-Clause
sebastian/diffBSD-3-Clause
sebastian/environmentBSD-3-Clause
sebastian/exporterBSD-3-Clause
sebastian/global-stateBSD-3-Clause
sebastian/recursion-contextBSD-3-Clause
sebastian/versionBSD-3-Clause
sensio/generator-bundleMIT
symfony/phpunit-bridgeMIT
-{% 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 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'howto.page_title'|trans }}{% endblock %} - -{% block content %} -

{{ 'howto.page_title'|trans }}

- -

{{ 'howto.page_description'|trans }}

- -

{{ 'howto.top_menu.browser_addons'|trans }}

- -

{{ 'howto.top_menu.mobile_apps'|trans }}

- -

{{ 'howto.top_menu.bookmarklet'|trans }}

-

- {{ 'howto.bookmarklet.description'|trans }} - {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} - -{% 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 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %} - -{% block content %} - -

{{ 'quickstart.intro.title'|trans }}

-

{{ 'quickstart.intro.paragraph_1'|trans }}

-

{{ 'quickstart.intro.paragraph_2'|trans }}

- -

{{ 'quickstart.configure.title'|trans }}

- - - {% if is_granted('ROLE_SUPER_ADMIN') %} -

{{ 'quickstart.admin.title'|trans }}

-

{{ 'quickstart.admin.description'|trans }}

- - {% endif %} - -

{{ 'quickstart.first_steps.title'|trans }}

- - -

{{ 'quickstart.migrate.title'|trans }}

-

{{ 'quickstart.migrate.description'|trans }}

- - -

{{ 'quickstart.developer.title'|trans }}

- - -

{{ 'quickstart.docs.title'|trans }}

- - -

{{ 'quickstart.support.title'|trans }}

-

{{ 'quickstart.support.description'|trans }}

- - -{% 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 similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig rename to 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 similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig rename to 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 similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig rename to 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 similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig rename to 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 similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig rename to 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 similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig rename to 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 similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig rename to 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 @@ +Hello {{username}}! + +To reset your password - please visit {{confirmationUrl}} + +Regards, +Wallabag bot diff --git a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig rename to 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 similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig rename to 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 similarity index 95% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig rename to 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 @@
{{ 'howto.top_menu.bookmarklet'|trans }}
{{ 'howto.bookmarklet.description'|trans }} - {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} + {% include '@WallabagCore/themes/common/Static/_bookmarklet.html.twig' %}
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 similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig rename to 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 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %} - -{% block content %} -
-
-
- -
-

{{ 'developer.client.page_description'|trans }}

- {{ form_start(form) }} - {{ form_errors(form) }} - -
- {{ form_label(form.name) }} - {{ form_errors(form.name) }} - {{ form_widget(form.name) }} -
- -
- {{ form_label(form.redirect_uris) }} - {{ form_errors(form.redirect_uris) }} - {{ form_widget(form.redirect_uris) }} -
- - {{ 'developer.client.action_back'|trans }} - {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - - {{ form_rest(form) }} -
- -
-
-
- -{% 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 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %} - -{% block content %} -
-
-
-
-

{{ 'developer.client_parameter.page_description'|trans }}

-
    -
  • {{ 'developer.client_parameter.field_name'|trans }}: 
    {{ client_name }}
    • -
  • {{ 'developer.client_parameter.field_id'|trans }}: 
    {{ client_id }}
    • -
  • {{ 'developer.client_parameter.field_secret'|trans }}: 
    {{ client_secret }}
    • -
- - {{ 'developer.client_parameter.back'|trans }} - {{ 'developer.client_parameter.read_howto'|trans }} -
-
-
-
-{% 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 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %} - -{% block css %} - {{ parent() }} - -{% endblock %} - -{% block content %} -
-
-
- -
-

{{ 'developer.howto.description.paragraph_1'|trans|raw }}

-

{{ 'developer.howto.description.paragraph_2'|trans }}

-

{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}

-

{{ 'developer.howto.description.paragraph_4'|trans }}

-

- 

http POST http://v2.wallabag.org/oauth/v2/token \
-    grant_type=password \
-    client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \
-    client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \
-    username=yourUsername \
-    password=yourPassw0rd
-

-

{{ 'developer.howto.description.paragraph_5'|trans }}

-

- 

HTTP/1.1 200 OK
-Cache-Control: no-store, private
-Connection: close
-Content-Type: application/json
-Date: Tue, 06 Oct 2015 18:24:03 GMT
-Host: localhost:8000
-Pragma: no-cache
-X-Debug-Token: be00a1
-X-Debug-Token-Link: /profiler/be00a1
-X-Powered-By: PHP/5.5.9-1ubuntu4.13
-{
-    "access_token": "ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw",
-    "expires_in": 3600,
-    "refresh_token": "ODBjODU1NWUwNmUzZTBkNDQ5YWVlZTVlMjQ2Y2I0OWM2NTM1ZGM2M2Y3MDhjMTViM2U2MzYxYzRkMDk5ODRlZg",
-    "scope": null,
-    "token_type": "bearer"
-}
-

-

{{ 'developer.howto.description.paragraph_6'|trans }}

-

- 

http GET http://v2.wallabag.org/api/entries.json \
-    "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"
-

-

{{ 'developer.howto.description.paragraph_7'|trans }}

-

{{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}

-

{{ 'developer.howto.back'|trans }}

-
- -
-
-
- - -{% 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 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'developer.page_title'|trans }}{% endblock %} - -{% block content %} -
-
-
- -
-

{{ 'developer.welcome_message'|trans }}

- -

{{ 'developer.documentation'|trans }}

- - - -

{{ 'developer.clients.title'|trans }}

- - -

{{ 'developer.existing_clients.title'|trans }}

- {% if clients %} -
    - {% for client in clients %} -
  • -
    {{ client.name }} - #{{ client.id }}
    -
    - - - - - - - - - - - - - - - - - -
    {{ 'developer.existing_clients.field_id'|trans }}{{ client.id }}_{{ client.randomId }}
    {{ 'developer.existing_clients.field_secret'|trans }}{{ client.secret }}
    {{ 'developer.existing_clients.field_uris'|trans }}{{ client.redirectUris|json_encode() }}
    {{ 'developer.existing_clients.field_grant_types'|trans }}{{ client.allowedGrantTypes|json_encode() }}
    -

    - {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}
    - {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}
    - {{ 'developer.remove.action'|trans({'%name%': client.name }) }} -

    -
    -
    • - {% endfor %} -
- {% else %} - {{ 'developer.existing_clients.no_client'|trans }} - {% endif %} -
- -
-
-
- -{% 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 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% include "@WallabagCore/themes/_title.html.twig" %} + {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} {% endblock %} {% 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 @@ - - - - wallabag — {{type}} feed - {{ url('unread') }} - {{ "now"|date('D, d M Y H:i:s') }} - wallabag - wallabag {{type}} elements - - {% for entry in entries %} - - - <![CDATA[{{ entry.title }}]]> - wallabag - {{ entry.url }} - {{ entry.url }} - {{ entry.createdAt|date('D, d M Y H:i:s') }} - - 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]> - - - - {% endfor %} - - - -- 2.41.0