diff options
author | lizyn <zhiylin@outlook.com> | 2020-02-24 10:04:13 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-24 10:04:13 +0800 |
commit | b19df31d78d881a43bcf6b3215e5fc3781e8e8aa (patch) | |
tree | d0d9861694a4b5e5fbfdbeb53c255ecd15fe9328 /src/Wallabag/CoreBundle/Resources/views/themes/common/Developer | |
parent | 4d0c632c70ea50d459c3c55ddda2e0f394dd51cb (diff) | |
parent | 04d918cae0227c06a41d27fb6533dddbf30dfe71 (diff) | |
download | wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.tar.gz wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.tar.zst wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.zip |
Merge pull request #1 from wallabag/master
Keep up with the master again
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/common/Developer')
3 files changed, 36 insertions, 11 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig index b498cceb..3a3ba0c9 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig | |||
@@ -8,11 +8,29 @@ | |||
8 | <div class="card-panel settings"> | 8 | <div class="card-panel settings"> |
9 | <div class="row"> | 9 | <div class="row"> |
10 | <p>{{ 'developer.client_parameter.page_description'|trans }}</p> | 10 | <p>{{ 'developer.client_parameter.page_description'|trans }}</p> |
11 | <ul> | 11 | |
12 | <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li> | 12 | <table class="striped"> |
13 | <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li> | 13 | <tr> |
14 | <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li> | 14 | <td>{{ 'developer.client_parameter.field_name'|trans }}</td> |
15 | </ul> | 15 | <td><strong><code>{{ client_name }}</code></strong></td> |
16 | </tr> | ||
17 | <tr> | ||
18 | <td>{{ 'developer.client_parameter.field_id'|trans }}</td> | ||
19 | <td> | ||
20 | <strong><code>{{ client_id }}</code></strong> | ||
21 | <button class="btn" data-clipboard-text="{{ client_id }}">{{ 'developer.client.copy_to_clipboard'|trans }}</button> | ||
22 | </td> | ||
23 | </tr> | ||
24 | <tr> | ||
25 | <td>{{ 'developer.client_parameter.field_secret'|trans }}</td> | ||
26 | <td> | ||
27 | <strong><code>{{ client_secret }}</code></strong> | ||
28 | <button class="btn" data-clipboard-text="{{ client_secret }}">{{ 'developer.client.copy_to_clipboard'|trans }}</button> | ||
29 | </td> | ||
30 | </tr> | ||
31 | </table> | ||
32 | |||
33 | <br/> | ||
16 | 34 | ||
17 | <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a> | 35 | <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> | 36 | <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig index acbc2c88..dcadfa49 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig | |||
@@ -18,7 +18,7 @@ | |||
18 | <p>{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}</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> | 19 | <p>{{ 'developer.howto.description.paragraph_4'|trans }}</p> |
20 | <p> | 20 | <p> |
21 | <pre><code class="language-bash">http POST http://v2.wallabag.org/oauth/v2/token \ | 21 | <pre><code class="language-bash">http POST https://app.wallabag.it/oauth/v2/token \ |
22 | grant_type=password \ | 22 | grant_type=password \ |
23 | client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \ | 23 | client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \ |
24 | client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \ | 24 | client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \ |
@@ -47,7 +47,7 @@ X-Powered-By: PHP/5.5.9-1ubuntu4.13 | |||
47 | </p> | 47 | </p> |
48 | <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p> | 48 | <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p> |
49 | <p> | 49 | <p> |
50 | <pre><code class="language-bash">http GET http://v2.wallabag.org/api/entries.json \ | 50 | <pre><code class="language-bash">http GET https://app.wallabag.it/api/entries.json \ |
51 | "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre> | 51 | "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre> |
52 | </p> | 52 | </p> |
53 | <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p> | 53 | <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig index be04cddb..b83bf96f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig | |||
@@ -33,11 +33,17 @@ | |||
33 | <table class="striped"> | 33 | <table class="striped"> |
34 | <tr> | 34 | <tr> |
35 | <td>{{ 'developer.existing_clients.field_id'|trans }}</td> | 35 | <td>{{ 'developer.existing_clients.field_id'|trans }}</td> |
36 | <td><strong><code>{{ client.clientId }}</code></strong></td> | 36 | <td> |
37 | <strong><code>{{ client.clientId }}</code></strong> | ||
38 | <button class="btn" data-clipboard-text="{{ client.clientId }}">{{ 'developer.client.copy_to_clipboard'|trans }}</button> | ||
39 | </td> | ||
37 | </tr> | 40 | </tr> |
38 | <tr> | 41 | <tr> |
39 | <td>{{ 'developer.existing_clients.field_secret'|trans }}</td> | 42 | <td>{{ 'developer.existing_clients.field_secret'|trans }}</td> |
40 | <td><strong><code>{{ client.secret }}</code></strong></td> | 43 | <td> |
44 | <strong><code>{{ client.secret }}</code></strong> | ||
45 | <button class="btn" data-clipboard-text="{{ client.secret }}">{{ 'developer.client.copy_to_clipboard'|trans }}</button> | ||
46 | </td> | ||
41 | </tr> | 47 | </tr> |
42 | <tr> | 48 | <tr> |
43 | <td>{{ 'developer.existing_clients.field_uris'|trans }}</td> | 49 | <td>{{ 'developer.existing_clients.field_uris'|trans }}</td> |
@@ -48,9 +54,10 @@ | |||
48 | <td><strong><code>{{ client.allowedGrantTypes|json_encode() }}</code></strong></td> | 54 | <td><strong><code>{{ client.allowedGrantTypes|json_encode() }}</code></strong></td> |
49 | </tr> | 55 | </tr> |
50 | </table> | 56 | </table> |
57 | |||
58 | <p>{{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}</p> | ||
59 | <p>{{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}</p> | ||
51 | <p> | 60 | <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> | 61 | <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> | 62 | </p> |
56 | </div> | 63 | </div> |