diff --git a/src/Wallabag/CoreBundle/Controller/DeveloperController.php b/src/Wallabag/CoreBundle/Controller/DeveloperController.php index 63386db0c..f3492b74e 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 40111af0b..3b28e6350 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 2118885c1..38e3b5a0e 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 2a57f06fb..82714217b 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 1554cce47..ffc5bec65 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 918249dcf..000000000 --- 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.helping.description'|trans }}
- -{{ 'about.contributors.description'|trans }}
- -{{ 'about.third_party.description'|trans }}
-{{ 'about.third_party.package'|trans }} | -{{ 'about.third_party.license'|trans }} | -
---|---|
behat/transliterator | Artistic 1.0 |
CraueConfigBundle | MIT |
doctrine/annotations | MIT |
doctrine/cache | MIT |
doctrine/collections | MIT |
doctrine/common | MIT |
doctrine/dbal | MIT |
doctrine/doctrine-bundle | MIT |
doctrine/doctrine-cache-bundle | MIT |
doctrine/doctrine-migrations-bundle | MIT |
doctrine/inflector | MIT |
doctrine/instantiator | MIT |
doctrine/lexer | MIT |
doctrine/migrations | LGPL-2.1 |
doctrine/orm | MIT |
friendsofsymfony/oauth-server-bundle | MIT |
friendsofsymfony/oauth2-php | MIT |
friendsofsymfony/rest-bundle | MIT |
friendsofsymfony/user-bundle | MIT |
gedmo/doctrine-extensions | MIT |
grandt/binstring | LGPL-2.1 |
grandt/phpepub | LGPL-2.1 |
grandt/phpresizegif | LGPL-2.1 |
grandt/phpzipmerge | LGPL-2.1 |
grandt/relativepath | LGPL-2.1 |
guzzlehttp/guzzle | MIT |
guzzlehttp/ringphp | MIT |
guzzlehttp/streams | MIT |
hoa/compiler | BSD-3-Clause |
hoa/consistency | BSD-3-Clause |
hoa/event | BSD-3-Clause |
hoa/exception | BSD-3-Clause |
hoa/file | BSD-3-Clause |
hoa/iterator | BSD-3-Clause |
hoa/math | BSD-3-Clause |
hoa/protocol | BSD-3-Clause |
hoa/regex | BSD-3-Clause |
hoa/ruler | BSD-3-Clausev - |
hoa/stream | BSD-3-Clause |
hoa/ustring | BSD-3-Clause |
hoa/visitor | BSD-3-Clause |
hoa/zformat | BSD-3-Clause |
htmlawed/htmlawed | GPL-2.0+ or LGPL-3.0 |
incenteev/composer-parameter-handler | MIT |
j0k3r/graby | AGPL-3.0 |
j0k3r/graby-site-config | AGPL-3.0 |
j0k3r/php-readability | Apache-2.0 |
j0k3r/safecurl | MIT |
jdorn/sql-formatter | MIT |
jms/metadata | Apache |
jms/parser-lib | Apache2 |
jms/serializer | Apache2 |
jms/serializer-bundle | Apache2 |
kphoen/rulerz | MIT |
kphoen/rulerz-bundle | MIT |
kriswallsmith/assetic | MIT |
lexik/form-filter-bundle | MIT |
liip/theme-bundle | MIT |
mgargano/simplehtmldom | MIT |
michelf/php-markdown | BSD-3-Clause |
monolog/monolog | MIT |
neitanod/forceutf8 | BSD-3-Clause |
nelmio/api-doc-bundle | MIT |
nelmio/cors-bundle | MIT |
ocramius/proxy-manager | MIT |
pagerfanta/pagerfanta | MIT |
paragonie/random_compat | MIT |
phpcollection/phpcollection | Apache2 |
phpoption/phpoption | Apache2 |
phpzip/phpzip | LGPL-2.1 |
psr/log | MIT |
react/promise | MIT |
scheb/two-factor-bundle | MIT |
sensio/distribution-bundle | MIT |
sensio/framework-extra-bundle | MIT |
sensiolabs/security-checker | MIT |
simplepie/simplepie | BSD-3-Clause |
smalot/pdfparser | GPL-3.0 |
sonata-project/google-authenticator | MIT |
stof/doctrine-extensions-bundle | MIT |
swiftmailer/swiftmailer | MIT |
symfony/assetic-bundle | MIT |
symfony/monolog-bundle | MIT |
All of Symfony | MIT-licenced |
tecnickcom/tcpdf | LGPLv3 |
twig/extensions | MIT |
twig/twig | BSD-3-Clause |
wallabag/php-mobi | Apache-2.0 |
willdurand/hateoas | MIT |
willdurand/hateoas-bundle | MIT |
willdurand/jsonp-callback-validator | MIT |
willdurand/negotiation | MIT |
zendframework/zend-code | BSD-3-Clause |
zendframework/zend-eventmanager | BSD-3-Clause |
doctrine/data-fixtures | MIT |
doctrine/doctrine-fixtures-bundle | MIT |
phpdocumentor/reflection-docblock | MIT |
phpspec/prophecy | MIT |
phpunit/php-code-coverage | BSD-3-Clause |
phpunit/php-file-iterator | BSD-3-Clause |
phpunit/php-text-template | BSD-3-Clause |
phpunit/php-timer | BSD-3-Clause |
phpunit/php-token-stream | BSD-3-Clause |
phpunit/phpunit | BSD-3-Clause |
phpunit/phpunit-mock-objects | BSD-3-Clause |
sebastian/comparator | BSD-3-Clause |
sebastian/diff | BSD-3-Clause |
sebastian/environment | BSD-3-Clause |
sebastian/exporter | BSD-3-Clause |
sebastian/global-state | BSD-3-Clause |
sebastian/recursion-context | BSD-3-Clause |
sebastian/version | BSD-3-Clause |
sensio/generator-bundle | MIT |
symfony/phpunit-bridge | MIT |
{{ 'howto.page_description'|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 ea1c1cbec..000000000 --- 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.paragraph_1'|trans }}
-{{ 'quickstart.intro.paragraph_2'|trans }}
- -{{ 'quickstart.admin.description'|trans }}
-{{ 'quickstart.migrate.description'|trans }}
-{{ 'quickstart.support.description'|trans }}
-{{ 'developer.client.page_description'|trans }}
- {{ form_start(form) }} - {{ form_errors(form) }} - -{{ 'developer.client_parameter.page_description'|trans }}
-{{ client_name }}
{{ client_id }}
{{ client_secret }}
{{ '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.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 }) }}
-