diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-05-21 18:09:38 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-22 20:18:27 +0200 |
commit | 9c545fe028013b30417c1a932cd6b9027bff752d (patch) | |
tree | 3de7e843c34d058355a3b3a4c090b61bca9c2078 /src/Wallabag/CoreBundle/Resources/views/themes/baggy | |
parent | db4d63fc1ae513335b751beb8f89e1eed61871c2 (diff) | |
download | wallabag-9c545fe028013b30417c1a932cd6b9027bff752d.tar.gz wallabag-9c545fe028013b30417c1a932cd6b9027bff752d.tar.zst wallabag-9c545fe028013b30417c1a932cd6b9027bff752d.zip |
Added name on client
- Fix typos in field name
- Added migration for name field in API client table
Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2171
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy')
3 files changed, 11 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig index 78a9dc04..8a5da71a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig | |||
@@ -13,6 +13,12 @@ | |||
13 | {{ form_errors(form) }} | 13 | {{ form_errors(form) }} |
14 | 14 | ||
15 | <div class="input-field col s12"> | 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"> | ||
16 | {{ form_label(form.redirect_uris) }} | 22 | {{ form_label(form.redirect_uris) }} |
17 | {{ form_errors(form.redirect_uris) }} | 23 | {{ form_errors(form.redirect_uris) }} |
18 | {{ form_widget(form.redirect_uris) }} | 24 | {{ form_widget(form.redirect_uris) }} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig index b615fa3b..b498cceb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig | |||
@@ -9,6 +9,7 @@ | |||
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 | <ul> |
12 | <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li> | ||
12 | <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li> | 13 | <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li> |
13 | <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li> | 14 | <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li> |
14 | </ul> | 15 | </ul> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig index 001c5cbb..3430c0d4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig | |||
@@ -28,7 +28,7 @@ | |||
28 | <ul class="collapsible" data-collapsible="expandable"> | 28 | <ul class="collapsible" data-collapsible="expandable"> |
29 | {% for client in clients %} | 29 | {% for client in clients %} |
30 | <li> | 30 | <li> |
31 | <div class="collapsible-header">#{{ client.id }}</div> | 31 | <div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div> |
32 | <div class="collapsible-body"> | 32 | <div class="collapsible-body"> |
33 | <table class="striped"> | 33 | <table class="striped"> |
34 | <tr> | 34 | <tr> |
@@ -49,9 +49,9 @@ | |||
49 | </tr> | 49 | </tr> |
50 | </table> | 50 | </table> |
51 | <p> | 51 | <p> |
52 | {{ 'developer.remove.warn_message_1'|trans }}<br/> | 52 | {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/> |
53 | {{ 'developer.remove.warn_message_2'|trans }}<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 }}</a> | 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> | 55 | </p> |
56 | </div> | 56 | </div> |
57 | </li> | 57 | </li> |