diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-07-17 17:04:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-17 17:04:14 +0200 |
commit | 3a08e81969e9deafdb4d1aa890c03d67adcc4897 (patch) | |
tree | 226b19a667517ed9a6dd276e1f9b0afa8fac289b /src | |
parent | 4910361ac4c5bcf662e99d9de407d572ce1d731e (diff) | |
parent | df45126a1475ea2051a8285d89f3693c0bc61cd3 (diff) | |
download | wallabag-3a08e81969e9deafdb4d1aa890c03d67adcc4897.tar.gz wallabag-3a08e81969e9deafdb4d1aa890c03d67adcc4897.tar.zst wallabag-3a08e81969e9deafdb4d1aa890c03d67adcc4897.zip |
Merge pull request #4058 from wallabag/feature/copy-client-info
Copy client info to clipboard
Diffstat (limited to 'src')
16 files changed, 48 insertions, 9 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 2db283ae..6f381408 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | # redirect_uris_label: 'Redirect URIs' | 518 | # redirect_uris_label: 'Redirect URIs' |
519 | # save_label: 'Create a new client' | 519 | # save_label: 'Create a new client' |
520 | # action_back: 'Back' | 520 | # action_back: 'Back' |
521 | # copy_to_clipboard: Copy | ||
521 | # client_parameter: | 522 | # client_parameter: |
522 | # page_title: 'API clients management > Client parameters' | 523 | # page_title: 'API clients management > Client parameters' |
523 | # page_description: 'Here are your client parameters.' | 524 | # page_description: 'Here are your client parameters.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index db01272f..7efb18aa 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | redirect_uris_label: 'Weiterleitungs-URIs' | 518 | redirect_uris_label: 'Weiterleitungs-URIs' |
519 | save_label: 'Neuen Client erstellen' | 519 | save_label: 'Neuen Client erstellen' |
520 | action_back: 'Zurück' | 520 | action_back: 'Zurück' |
521 | # copy_to_clipboard: Copy | ||
521 | client_parameter: | 522 | client_parameter: |
522 | page_title: 'API-Client-Verwaltung > Client-Parameter' | 523 | page_title: 'API-Client-Verwaltung > Client-Parameter' |
523 | page_description: 'Dies sind deine Client-Parameter.' | 524 | page_description: 'Dies sind deine Client-Parameter.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 6d006310..cf98e408 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | redirect_uris_label: 'Redirect URIs (optional)' | 518 | redirect_uris_label: 'Redirect URIs (optional)' |
519 | save_label: 'Create a new client' | 519 | save_label: 'Create a new client' |
520 | action_back: 'Back' | 520 | action_back: 'Back' |
521 | copy_to_clipboard: Copy | ||
521 | client_parameter: | 522 | client_parameter: |
522 | page_title: 'API clients management > Client parameters' | 523 | page_title: 'API clients management > Client parameters' |
523 | page_description: 'Here are your client parameters.' | 524 | page_description: 'Here are your client parameters.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 0eb74396..f1a9c063 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | redirect_uris_label: 'URIs de redirección' | 518 | redirect_uris_label: 'URIs de redirección' |
519 | save_label: 'Crear un nuevo cliente' | 519 | save_label: 'Crear un nuevo cliente' |
520 | action_back: 'Volver' | 520 | action_back: 'Volver' |
521 | # copy_to_clipboard: Copy | ||
521 | client_parameter: | 522 | client_parameter: |
522 | page_title: 'Gestión de clientes API > Parámetros del cliente' | 523 | page_title: 'Gestión de clientes API > Parámetros del cliente' |
523 | page_description: 'Aquí están los parámetros del cliente.' | 524 | page_description: 'Aquí están los parámetros del cliente.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 35afdbf4..66e83e16 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | # redirect_uris_label: 'Redirect URIs' | 518 | # redirect_uris_label: 'Redirect URIs' |
519 | # save_label: 'Create a new client' | 519 | # save_label: 'Create a new client' |
520 | # action_back: 'بازگشت' | 520 | # action_back: 'بازگشت' |
521 | # copy_to_clipboard: Copy | ||
521 | # client_parameter: | 522 | # client_parameter: |
522 | # page_title: 'API clients management > Client parameters' | 523 | # page_title: 'API clients management > Client parameters' |
523 | # page_description: 'Here are your client parameters.' | 524 | # page_description: 'Here are your client parameters.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 8a79b02f..886f89e4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | redirect_uris_label: "Adresses de redirection (optionnel)" | 518 | redirect_uris_label: "Adresses de redirection (optionnel)" |
519 | save_label: "Créer un nouveau client" | 519 | save_label: "Créer un nouveau client" |
520 | action_back: "Retour" | 520 | action_back: "Retour" |
521 | copy_to_clipboard: Copier | ||
521 | client_parameter: | 522 | client_parameter: |
522 | page_title: "Gestion des clients API > Les paramètres de votre client" | 523 | page_title: "Gestion des clients API > Les paramètres de votre client" |
523 | page_description: "Voilà les paramètres de votre client" | 524 | page_description: "Voilà les paramètres de votre client" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 859bbb14..3640e0a0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | redirect_uris_label: 'Redirect URI' | 518 | redirect_uris_label: 'Redirect URI' |
519 | save_label: 'Crea un nuovo client' | 519 | save_label: 'Crea un nuovo client' |
520 | action_back: 'Indietro' | 520 | action_back: 'Indietro' |
521 | # copy_to_clipboard: Copy | ||
521 | client_parameter: | 522 | client_parameter: |
522 | page_title: 'Gestione client API > Parametri Client' | 523 | page_title: 'Gestione client API > Parametri Client' |
523 | page_description: 'Questi sono i tuoi parametri del client.' | 524 | page_description: 'Questi sono i tuoi parametri del client.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 7d928613..768116bd 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | redirect_uris_label: 'URLs de redireccion' | 518 | redirect_uris_label: 'URLs de redireccion' |
519 | save_label: 'Crear un novèl client' | 519 | save_label: 'Crear un novèl client' |
520 | action_back: 'Retorn' | 520 | action_back: 'Retorn' |
521 | # copy_to_clipboard: Copy | ||
521 | client_parameter: | 522 | client_parameter: |
522 | page_title: 'Gestion dels clients API > Los paramètres de vòstre client' | 523 | page_title: 'Gestion dels clients API > Los paramètres de vòstre client' |
523 | page_description: 'Vaquí los paramètres de vòstre client.' | 524 | page_description: 'Vaquí los paramètres de vòstre client.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 8e7ad7f2..909f7058 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | redirect_uris_label: 'Przekieruj adresy URI' | 518 | redirect_uris_label: 'Przekieruj adresy URI' |
519 | save_label: 'Stwórz nowego klienta' | 519 | save_label: 'Stwórz nowego klienta' |
520 | action_back: 'Cofnij' | 520 | action_back: 'Cofnij' |
521 | # copy_to_clipboard: Copy | ||
521 | client_parameter: | 522 | client_parameter: |
522 | page_title: 'Zarządzanie klientami API > Parametry klienta' | 523 | page_title: 'Zarządzanie klientami API > Parametry klienta' |
523 | page_description: 'Tutaj znajdują się parametry klienta.' | 524 | page_description: 'Tutaj znajdują się parametry klienta.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index ee45c085..722ef0db 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | redirect_uris_label: 'URIs de redirecionamento' | 518 | redirect_uris_label: 'URIs de redirecionamento' |
519 | save_label: 'Criar um novo cliente' | 519 | save_label: 'Criar um novo cliente' |
520 | action_back: 'Voltar' | 520 | action_back: 'Voltar' |
521 | # copy_to_clipboard: Copy | ||
521 | client_parameter: | 522 | client_parameter: |
522 | # page_title: 'API clients management > Parâmetros de clientes' | 523 | # page_title: 'API clients management > Parâmetros de clientes' |
523 | page_description: 'Aqui estão os parâmetros de seus clientes.' | 524 | page_description: 'Aqui estão os parâmetros de seus clientes.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index edfc77a2..380b5233 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | # redirect_uris_label: 'Redirect URIs' | 518 | # redirect_uris_label: 'Redirect URIs' |
519 | # save_label: 'Create a new client' | 519 | # save_label: 'Create a new client' |
520 | # action_back: 'Back' | 520 | # action_back: 'Back' |
521 | # copy_to_clipboard: Copy | ||
521 | # client_parameter: | 522 | # client_parameter: |
522 | # page_title: 'API clients management > Client parameters' | 523 | # page_title: 'API clients management > Client parameters' |
523 | # page_description: 'Here are your client parameters.' | 524 | # page_description: 'Here are your client parameters.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index c99da444..a47525c6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | redirect_uris_label: 'Ссылка перенаправления (опционально)' | 518 | redirect_uris_label: 'Ссылка перенаправления (опционально)' |
519 | save_label: 'Создать нового клиента' | 519 | save_label: 'Создать нового клиента' |
520 | action_back: 'Назад' | 520 | action_back: 'Назад' |
521 | # copy_to_clipboard: Copy | ||
521 | client_parameter: | 522 | client_parameter: |
522 | page_title: 'Управление клиентским API > Параметры клиента' | 523 | page_title: 'Управление клиентским API > Параметры клиента' |
523 | page_description: 'Здесь ваши параметры клиента.' | 524 | page_description: 'Здесь ваши параметры клиента.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index 9927d059..5879c48f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | redirect_uris_label: 'เส้นทางใหม่ของ URIs (ให้เลือกได้)' | 518 | redirect_uris_label: 'เส้นทางใหม่ของ URIs (ให้เลือกได้)' |
519 | save_label: 'สร่้างลูกข่ายใหม' | 519 | save_label: 'สร่้างลูกข่ายใหม' |
520 | action_back: 'กลับ' | 520 | action_back: 'กลับ' |
521 | # copy_to_clipboard: Copy | ||
521 | client_parameter: | 522 | client_parameter: |
522 | page_title: 'การจัดการลูกข่ายของ API > พารามิเตอร์ของลูกข่าย' | 523 | page_title: 'การจัดการลูกข่ายของ API > พารามิเตอร์ของลูกข่าย' |
523 | page_description: 'ที่นี้เป็นพารามิเตอร์ของลูกข่ายของคุณ' | 524 | page_description: 'ที่นี้เป็นพารามิเตอร์ของลูกข่ายของคุณ' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 60fa44d5..d023e368 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -518,6 +518,7 @@ developer: | |||
518 | # redirect_uris_label: 'Redirect URIs' | 518 | # redirect_uris_label: 'Redirect URIs' |
519 | # save_label: 'Create a new client' | 519 | # save_label: 'Create a new client' |
520 | # action_back: 'Back' | 520 | # action_back: 'Back' |
521 | # copy_to_clipboard: Copy | ||
521 | # client_parameter: | 522 | # client_parameter: |
522 | # page_title: 'API clients management > Client parameters' | 523 | # page_title: 'API clients management > Client parameters' |
523 | # page_description: 'Here are your client parameters.' | 524 | # page_description: 'Here are your client parameters.' |
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/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> |