pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Added name on client

Browse Source 
- 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
This commit is contained in:
Thomas Citharel
2016-05-21 18:09:38 +02:00
committed by Jeremy Benoist
parent db4d63fc1a
commit 9c545fe028
13 changed files with 110 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
View File

@ -12,6 +12,12 @@
{{ form_start(form) }}
{{ form_errors(form) }}
<div class="input-field col s12">
{{ form_label(form.name) }}
{{ form_errors(form.name) }}
{{ form_widget(form.name) }}
</div>
<div class="input-field col s12">
{{ form_label(form.redirect_uris) }}
{{ form_errors(form.redirect_uris) }}

1
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig
View File

@ -9,6 +9,7 @@
<div class="row">
<p>{{ 'developer.client_parameter.page_description'|trans }}</p>
<ul>
<li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
<li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
<li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
</ul>

8
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
View File

@ -28,7 +28,7 @@
<ul class="collapsible" data-collapsible="expandable">
{% for client in clients %}
<li>
<div class="collapsible-header">#{{ client.id }}</div>
<div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div>
<div class="collapsible-body">
<table class="striped">
<tr>
@ -49,9 +49,9 @@
</tr>
</table>
<p>
{{ 'developer.remove.warn_message_1'|trans }}<br/>
{{ 'developer.remove.warn_message_2'|trans }}<br/>
<a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans }}</a>
{{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
{{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
<a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
</p>
</div>
</li>

6
src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig
View File

@ -12,6 +12,12 @@
{{ form_start(form) }}
{{ form_errors(form) }}
<div class="input-field col s12">
{{ form_label(form.name) }}
{{ form_errors(form.name) }}
{{ form_widget(form.name) }}
</div>
<div class="input-field col s12">
{{ form_label(form.redirect_uris) }}
{{ form_errors(form.redirect_uris) }}

1
src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
View File

@ -9,6 +9,7 @@
<div class="row">
<p>{{ 'developer.client_parameter.page_description'|trans }}</p>
<ul>
<li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
<li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
<li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
</ul>

8
src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
View File

@ -28,7 +28,7 @@
<ul class="collapsible" data-collapsible="expandable">
{% for client in clients %}
<li>
<div class="collapsible-header">#{{ client.id }}</div>
<div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div>
<div class="collapsible-body">
<table class="striped">
<tr>
@ -49,9 +49,9 @@
</tr>
</table>
<p>
{{ 'developer.remove.warn_message_1'|trans }}<br/>
{{ 'developer.remove.warn_message_2'|trans }}<br/>
<a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans }}</a>
{{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
{{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
<a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
</p>
</div>
</li>