diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes')
5 files changed, 125 insertions, 109 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig index 8a5da71a..09e138ed 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig | |||
@@ -1,6 +1,6 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %} | 3 | {% block title %}{{ 'apps.old_client.page_title'|trans }}{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | <div class="row"> | 6 | <div class="row"> |
@@ -8,7 +8,7 @@ | |||
8 | <div class="card-panel settings"> | 8 | <div class="card-panel settings"> |
9 | 9 | ||
10 | <div class="row"> | 10 | <div class="row"> |
11 | <p>{{ 'developer.client.page_description'|trans }}</p> | 11 | <p>{{ 'apps.old_client.page_description'|trans }}</p> |
12 | {{ form_start(form) }} | 12 | {{ form_start(form) }} |
13 | {{ form_errors(form) }} | 13 | {{ form_errors(form) }} |
14 | 14 | ||
@@ -18,13 +18,7 @@ | |||
18 | {{ form_widget(form.name) }} | 18 | {{ form_widget(form.name) }} |
19 | </div> | 19 | </div> |
20 | 20 | ||
21 | <div class="input-field col s12"> | 21 | <a href="{{ path('apps') }}" class="waves-effect waves-light grey btn">{{ 'apps.old_client.action_back'|trans }}</a> |
22 | {{ form_label(form.redirect_uris) }} | ||
23 | {{ form_errors(form.redirect_uris) }} | ||
24 | {{ form_widget(form.redirect_uris) }} | ||
25 | </div> | ||
26 | |||
27 | <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client.action_back'|trans }}</a> | ||
28 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 22 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
29 | 23 | ||
30 | {{ form_rest(form) }} | 24 | {{ form_rest(form) }} |
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..30b90252 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 | |||
@@ -1,21 +1,20 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %} | 3 | {% block title %}{{ 'apps.old_client.parameters.page_title'|trans }}{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | <div class="row"> | 6 | <div class="row"> |
7 | <div class="col s12"> | 7 | <div class="col s12"> |
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>{{ 'apps.old_client.parameters.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>{{ 'apps.old_client.parameters.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li> |
13 | <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li> | 13 | <li>{{ 'apps.old_client.parameters.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li> |
14 | <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li> | 14 | <li>{{ 'apps.old_client.parameters.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li> |
15 | </ul> | 15 | </ul> |
16 | 16 | ||
17 | <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a> | 17 | <a href="{{ path('apps') }}" class="waves-effect waves-light grey btn">{{ 'apps.old_client.parameters.back'|trans }}</a> |
18 | <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a> | ||
19 | </div> | 18 | </div> |
20 | </div> | 19 | </div> |
21 | </div> | 20 | </div> |
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 deleted file mode 100644 index acbc2c88..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block css %} | ||
6 | {{ parent() }} | ||
7 | <link rel="stylesheet" href="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/themes/prism-dark.min.css') }}"> | ||
8 | {% endblock %} | ||
9 | |||
10 | {% block content %} | ||
11 | <div class="row"> | ||
12 | <div class="col s12"> | ||
13 | <div class="card-panel settings"> | ||
14 | |||
15 | <div class="row"> | ||
16 | <p>{{ 'developer.howto.description.paragraph_1'|trans|raw }}</p> | ||
17 | <p>{{ 'developer.howto.description.paragraph_2'|trans }}</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> | ||
20 | <p> | ||
21 | <pre><code class="language-bash">http POST http://v2.wallabag.org/oauth/v2/token \ | ||
22 | grant_type=password \ | ||
23 | client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \ | ||
24 | client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \ | ||
25 | username=yourUsername \ | ||
26 | password=yourPassw0rd</code></pre> | ||
27 | </p> | ||
28 | <p>{{ 'developer.howto.description.paragraph_5'|trans }}</p> | ||
29 | <p> | ||
30 | <pre><code class="language-bash">HTTP/1.1 200 OK | ||
31 | Cache-Control: no-store, private | ||
32 | Connection: close | ||
33 | Content-Type: application/json | ||
34 | Date: Tue, 06 Oct 2015 18:24:03 GMT | ||
35 | Host: localhost:8000 | ||
36 | Pragma: no-cache | ||
37 | X-Debug-Token: be00a1 | ||
38 | X-Debug-Token-Link: /profiler/be00a1 | ||
39 | X-Powered-By: PHP/5.5.9-1ubuntu4.13 | ||
40 | { | ||
41 | "access_token": "ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw", | ||
42 | "expires_in": 3600, | ||
43 | "refresh_token": "ODBjODU1NWUwNmUzZTBkNDQ5YWVlZTVlMjQ2Y2I0OWM2NTM1ZGM2M2Y3MDhjMTViM2U2MzYxYzRkMDk5ODRlZg", | ||
44 | "scope": null, | ||
45 | "token_type": "bearer" | ||
46 | }</code></pre> | ||
47 | </p> | ||
48 | <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p> | ||
49 | <p> | ||
50 | <pre><code class="language-bash">http GET http://v2.wallabag.org/api/entries.json \ | ||
51 | "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre> | ||
52 | </p> | ||
53 | <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p> | ||
54 | <p>{{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}</p> | ||
55 | <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.howto.back'|trans }}</a></p> | ||
56 | </div> | ||
57 | |||
58 | </div> | ||
59 | </div> | ||
60 | </div> | ||
61 | <script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/prism.min.js') }}"></script> | ||
62 | <script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/components/prism-bash.min.js') }}"></script> | ||
63 | {% endblock %} | ||
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 528b055c..a41e64f7 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 | |||
@@ -1,67 +1,153 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{{ 'developer.page_title'|trans }}{% endblock %} | 3 | {% block title %}{{ 'apps.page_title'|trans }}{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | <div class="row"> | 6 | <div class="row"> |
7 | <div class="col s12"> | 7 | <div class="col s12"> |
8 | <div class="card-panel settings"> | 8 | <div class="card-panel settings"> |
9 | |||
10 | <div class="row"> | 9 | <div class="row"> |
11 | <h3>{{ 'developer.welcome_message'|trans }}</h3> | 10 | <h4>{{ 'apps.featured.title'|trans }}</h4> |
11 | |||
12 | <div class="slider"> | ||
13 | <ul class="slides"> | ||
14 | <li> | ||
15 | <img src="{{ asset('assets/appicons/android_full.png') }}"> | ||
16 | <div class="caption right-align"> | ||
17 | <h3>Android</h3> | ||
18 | <h5 class="light grey-text text-lighten-3">For all Android 4.4+ devices</h5> | ||
19 | <p> | ||
20 | <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche"> | ||
21 | <img class="icon" alt="Get it on Google Play" | ||
22 | height="80" | ||
23 | src="{{ asset('assets/appicons/google_play.png') }}" /> | ||
24 | </a> | ||
25 | <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche"> | ||
26 | <img class="icon" alt="Get it on F-Droid" | ||
27 | height="80" | ||
28 | src="{{ asset('assets/appicons/fdroid.png') }}" /> | ||
29 | </a> | ||
30 | </p> | ||
31 | </div> | ||
32 | </li> | ||
33 | <li> | ||
34 | <img style="background-position: right" src="{{ asset('assets/appicons/iOS_full.png') }}"> | ||
35 | <div class="caption left-align"> | ||
36 | <h3>iOS</h3> | ||
37 | <h5 class="light grey-text text-lighten-3">For your iPhones and iPads</h5> | ||
38 | <p> | ||
39 | <a href="https://itunes.apple.com/app/wallabag-2/id1170800946?mt=8"> | ||
40 | <img class="icon" alt="Get it on the AppStore" | ||
41 | height="80" | ||
42 | src="{{ asset('assets/appicons/appstore.svg') }}" /> | ||
43 | </a> | ||
44 | </p> | ||
45 | </div> | ||
46 | </li> | ||
47 | <li> | ||
48 | <img src="{{ asset('assets/appicons/windows.jpeg') }}"> | ||
49 | <div class="caption right-align"> | ||
50 | <h3>Windows</h3> | ||
51 | <h5 class="light grey-text text-lighten-3">Available on Windows Phones and Windows 10</h5> | ||
52 | <p> | ||
53 | <a href="https://www.microsoft.com/en-us/store/p/wallabag/9nblggh5x3p6"> | ||
54 | <img class="icon" alt="Get it on the Windows Store" | ||
55 | height="80" | ||
56 | src="{{ asset('assets/appicons/windowsstore.png') }}" /> | ||
57 | </a> | ||
58 | </p> | ||
59 | </div> | ||
60 | </li> | ||
61 | <li> | ||
62 | <img style="background-position: right" src="{{ asset('assets/appicons/browser.png') }}"> | ||
63 | <div class="caption left-align"> | ||
64 | <h3>Browser Extension</h3> | ||
65 | <h5 class="light grey-text text-lighten-3">Available on Firefox, Chrome and Opera</h5> | ||
66 | <p> | ||
67 | <a href="https://addons.mozilla.org/en/firefox/addon/wallabagger/"> | ||
68 | <img class="icon browser" alt="Get it on the Firefox Addons Website" | ||
69 | height="80" | ||
70 | src="{{ asset('assets/appicons/Firefox-logo.svg') }}" /> | ||
71 | </a> | ||
72 | <a href="https://chrome.google.com/webstore/detail/wallabagger/gbmgphmejlcoihgedabhgjdkcahacjlj"> | ||
73 | <img class="icon browser" alt="Get it on the Firefox Addons Website" | ||
74 | height="80" | ||
75 | src="{{ asset('assets/appicons/Logo_Google_Chrome.svg') }}" /> | ||
76 | </a> | ||
77 | <a href="https://addons.opera.com/fr/extensions/details/wallabagger/"> | ||
78 | <img class="icon browser" alt="Get it on the Firefox Addons Website" | ||
79 | height="80" | ||
80 | src="{{ asset('assets/appicons/opera-for-computers_icon_128x128.png') }}" /> | ||
81 | </a> | ||
82 | </p> | ||
83 | </div> | ||
84 | </li> | ||
85 | </ul> | ||
86 | </div> | ||
12 | 87 | ||
13 | <h4>{{ 'developer.documentation'|trans }}</h4> | 88 | <h4>{{ 'apps.list.title'|trans }}</h4> |
14 | 89 | ||
15 | <ul> | 90 | <ul class="collection"> |
16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> | 91 | {% for app in apps %} |
17 | <li><a href="https://doc.wallabag.org/en/developer/api/readme.html">{{ 'developer.full_documentation'|trans }}</a></li> | 92 | <li class="collection-item avatar"> |
18 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li> | 93 | {% if app.client.image %} |
94 | <img src="{{ app.client.image }}" alt="" class="circle"> | ||
95 | {% endif %} | ||
96 | <span class="title"><a href="{{ app.client.appUrl }}">{{ app.client.name }}</a></span> | ||
97 | <p>{{ app.client.description }}</p> | ||
98 | <div class="scopes"> | ||
99 | {% for scope in app.scope | split(' ') %} | ||
100 | <div class="chip">{{ scope }}</div> | ||
101 | {% endfor %} | ||
102 | </div> | ||
103 | <p>{{ 'apps.app.created_at' | trans({'%date%': app.client.createdAt}) }}</p> | ||
104 | <a href="#!" class="secondary-content"><i class="material-icons">grade</i></a> | ||
105 | </li> | ||
106 | {% endfor %} | ||
19 | </ul> | 107 | </ul> |
20 | 108 | ||
21 | <h4>{{ 'developer.clients.title'|trans }}</h4> | 109 | <h4>{{ 'apps.old_clients.title'|trans }}</h4> |
22 | <ul> | 110 | <ul> |
23 | <li><a href="{{ path('developer_create_client') }}">{{ 'developer.clients.create_new'|trans }}</a></li> | 111 | <li><a href="{{ path('apps_create_client') }}">{{ 'apps.old_clients.create_new'|trans }}</a></li> |
24 | </ul> | 112 | </ul> |
25 | 113 | ||
26 | <h4>{{ 'developer.existing_clients.title'|trans }}</h4> | 114 | <h5>{{ 'apps.old_clients.list'|trans }}</h5> |
27 | {% if clients %} | 115 | {% if clients %} |
28 | <ul class="collapsible" data-collapsible="expandable"> | 116 | <ul class="collapsible" data-collapsible="expandable"> |
29 | {% for client in clients %} | 117 | {% for client in clients %} |
30 | <li> | 118 | <li> |
31 | <div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div> | 119 | <div class="collapsible-header">{{ client.name }}</div> |
32 | <div class="collapsible-body"> | 120 | <div class="collapsible-body"> |
33 | <table class="striped"> | 121 | <table class="striped"> |
34 | <tr> | 122 | <tr> |
35 | <td>{{ 'developer.existing_clients.field_id'|trans }}</td> | 123 | <td>{{ 'apps.old_clients.field_id'|trans }}</td> |
36 | <td><strong><code>{{ client.clientId }}</code></strong></td> | 124 | <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td> |
37 | </tr> | 125 | </tr> |
38 | <tr> | 126 | <tr> |
39 | <td>{{ 'developer.existing_clients.field_secret'|trans }}</td> | 127 | <td>{{ 'apps.old_clients.field_secret'|trans }}</td> |
40 | <td><strong><code>{{ client.secret }}</code></strong></td> | 128 | <td><strong><code>{{ client.secret }}</code></strong></td> |
41 | </tr> | 129 | </tr> |
42 | <tr> | ||
43 | <td>{{ 'developer.existing_clients.field_uris'|trans }}</td> | ||
44 | <td><strong><code>{{ client.redirectUris|json_encode() }}</code></strong></td> | ||
45 | </tr> | ||
46 | <tr> | ||
47 | <td>{{ 'developer.existing_clients.field_grant_types'|trans }}</td> | ||
48 | <td><strong><code>{{ client.allowedGrantTypes|json_encode() }}</code></strong></td> | ||
49 | </tr> | ||
50 | </table> | 130 | </table> |
51 | <p> | 131 | <p> |
52 | {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/> | 132 | {{ 'apps.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/> |
53 | {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/> | 133 | {{ 'apps.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> | 134 | <a class="waves-effect waves-light red btn" href="{{ path('apps_delete_client', {'id': client.id}) }}">{{ 'apps.remove.action'|trans({'%name%': client.name }) }}</a> |
55 | </p> | 135 | </p> |
136 | |||
56 | </div> | 137 | </div> |
57 | </li> | 138 | </li> |
58 | {% endfor %} | 139 | {% endfor %} |
59 | </ul> | 140 | </ul> |
60 | {% else %} | 141 | {% else %} |
61 | {{ 'developer.existing_clients.no_client'|trans }} | 142 | {{ 'apps.old_clients.no_client'|trans }} |
62 | {% endif %} | 143 | {% endif %} |
63 | </div> | 144 | <h4>{{ 'apps.documentation.title'|trans }}</h4> |
64 | 145 | ||
146 | <ul> | ||
147 | <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'apps.documentation.full_documentation'|trans }}</a></li> | ||
148 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'apps.documentation.list_methods'|trans }}</a></li> | ||
149 | </ul> | ||
150 | </div> | ||
65 | </div> | 151 | </div> |
66 | </div> | 152 | </div> |
67 | </div> | 153 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 2dab1c18..6bee628d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -78,8 +78,8 @@ | |||
78 | <li class="bold {% if currentRoute == 'import' %}active{% endif %}"> | 78 | <li class="bold {% if currentRoute == 'import' %}active{% endif %}"> |
79 | <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a> | 79 | <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a> |
80 | </li> | 80 | </li> |
81 | <li class="bold {% if currentRoute == 'developer' %}active{% endif %}"> | 81 | <li class="bold {% if currentRoute == 'apps' %}active{% endif %}"> |
82 | <a class="waves-effect" href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a> | 82 | <a class="waves-effect" href="{{ path('apps') }}">{{ 'menu.left.apps'|trans }}</a> |
83 | </li> | 83 | </li> |
84 | <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"> | 84 | <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"> |
85 | <a class="waves-effect" href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a> | 85 | <a class="waves-effect" href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a> |