Skip to content

Commit 430808e

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents 5be86b9 + 6976dc2 commit 430808e

File tree

3 files changed

+104
-71
lines changed

3 files changed

+104
-71
lines changed

‎resources/lang/en-US/admin/settings/general.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,18 @@
287287
'zerofill_count' => 'Length of asset tags, including zerofill',
288288
'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
289289
'oauth_title' => 'OAuth API Settings',
290+
'oauth_clients' => 'OAuth Clients',
290291
'oauth' => 'OAuth',
291292
'oauth_help' => 'Oauth Endpoint Settings',
293+
'oauth_no_clients' => 'You have not created any OAuth clients yet.',
294+
'oauth_secret' => 'Secret',
295+
'oauth_authorized_apps' => 'Authorized Applications',
296+
'oauth_redirect_url' => 'Redirect URL',
297+
'oauth_name_help' => ' Something your users will recognize and trust.',
298+
'oauth_scopes' => 'Scopes',
299+
'oauth_callback_url' => 'Your application authorization callback URL.',
300+
'create_client' => 'Create Client',
301+
'no_scopes' => 'No scopes',
292302
'asset_tag_title' => 'Update Asset Tag Settings',
293303
'barcode_title' => 'Update Barcode Settings',
294304
'barcodes' => 'Barcodes',

‎resources/views/livewire/oauth-clients.blade.php‎

Lines changed: 93 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,84 @@
11
<div>
2-
<div class="panel panel-default">
3-
<div class="panel-heading">
4-
<div style="display: flex; justify-content: space-between; align-items: center;">
5-
<h2>
6-
OAuth Clients
2+
<div class="box box-default">
3+
4+
<div class="box-header">
5+
<h2 class="box-title">
6+
{{ trans('admin/settings/general.oauth_clients') }}
77
</h2>
8-
@if($authorizationError)
8+
@if ($authorizationError)
99
<div class="alert alert-danger">
10-
<p><strong>Whoops!</strong> Something went wrong!</p>
10+
<p>{{ trans('admin/users/message.insufficient_permissions') }}
1111
<br>
1212
{{ $authorizationError }}
13+
</p>
1314
</div>
1415
@endif
1516

16-
<a class="button button-small"
17-
wire:click="$emit('openModal')"
18-
onclick="$('#modal-create-client').modal('show');"
19-
>
20-
Create New Client
21-
</a>
17+
<div class="box-tools pull-right">
18+
<a class="btn btn-primary"
19+
wire:click="$emit('openModal')"
20+
onclick="$('#modal-create-client').modal('show');">
21+
{{ trans('general.create') }}
22+
</a>
23+
</div>
2224
</div>
23-
</div>
2425

25-
<div class="panel-body">
26-
<!-- Current Clients -->
27-
@if($clients->count() === 0)
28-
<p class="m-b-none">
29-
You have not created any OAuth clients.
30-
</p>
31-
@endif
26+
<div class="box-body">
27+
<!-- Current Clients -->
28+
@if($clients->count() === 0)
29+
<p>
30+
{{ trans('admin/settings/general.oauth_no_clients') }}
31+
</p>
32+
@endif
3233

33-
@if($clients->count() > 0)
34-
<table class="table table-borderless m-b-none">
34+
@if ($clients->count() > 0)
35+
<table class="table table-striped snipe-table">
3536
<thead>
3637
<tr>
37-
<th>Client ID</th>
38-
<th>Name</th>
39-
<th>Secret</th>
40-
<th><span class="sr-only">Edit</span></th>
41-
<th><span class="sr-only">Delete</span></th>
38+
<th>{{ trans('general.id') }}</th>
39+
<th>{{ trans('general.name') }}</th>
40+
<th>{{ trans('admin/settings/general.oauth_redirect_url') }}</th>
41+
<th>{{ trans('admin/settings/general.oauth_secret') }}</th>
42+
<th><span class="sr-only">{{ trans('general.actions') }}</span></th>
4243
</tr>
4344
</thead>
44-
4545
<tbody>
4646
@foreach($clients as $client)
4747
<tr>
4848
<!-- ID -->
49-
<td style="vertical-align: middle;">
49+
<td>
5050
{{ $client->id }}
5151
</td>
5252

5353
<!-- Name -->
54-
<td style="vertical-align: middle;">
54+
<td>
5555
{{ $client->name }}
5656
</td>
5757

58+
<!-- Redirect -->
59+
<td>
60+
{{ $client->redirect }}
61+
</td>
62+
5863
<!-- Secret -->
59-
<td style="vertical-align: middle;">
64+
<td>
6065
<code>{{ $client->secret }}</code>
6166
</td>
6267

63-
<!-- Edit Button -->
64-
<td style="vertical-align: middle;">
65-
<a class="action-link btn"
68+
<!-- Edit / Delete Button -->
69+
<td class="text-right">
70+
71+
<a class="action-link btn btn-sm btn-warning"
6672
wire:click="editClient('{{ $client->id }}')"
67-
onclick="$('#modal-edit-client').modal('show');"
68-
>
69-
Edit
73+
onclick="$('#modal-edit-client').modal('show');">
74+
<i class="fas fa-pencil-alt" aria-hidden="true"></i><span class="sr-only">{{ trans('general.update') }}</span>
7075
</a>
71-
</td>
7276

73-
<!-- Delete Button -->
74-
<td style="vertical-align: middle;" class="text-right">
7577
<a class="action-link btn btn-danger btn-sm" wire:click="deleteClient('{{ $client->id }}')">
76-
<i class="fas fa-trash"></i>
78+
<i class="fas fa-trash" aria-hidden="true"></i>
79+
<span class="sr-only">
80+
{{ trans('general.delete') }}
81+
</span>
7782
</a>
7883
</td>
7984
</tr>
@@ -82,44 +87,57 @@
8287
</table>
8388
@endif
8489
</div>
90+
</div>
91+
92+
93+
8594
<div>
8695
@if ($authorized_tokens->count() > 0)
8796
<div>
88-
<div class="panel panel-default">
89-
<h2 class="panel-heading">Authorized Applications</h2>
97+
<div class="box box-default">
98+
<div class="box-header">
99+
<h2>
100+
{{ trans('admin/settings/general.oauth_authorized_apps') }}
101+
</h2>
102+
</div>
90103

91-
<div class="panel-body">
104+
<div class="box-body">
92105
<!-- Authorized Tokens -->
93-
<table class="table table-borderless m-b-none">
106+
<table class="table table-striped snipe-table">
94107
<thead>
95108
<tr>
96-
<th>Name</th>
97-
<th>Scopes</th>
98-
<th><span class="sr-only">Delete</span></th>
109+
<th>{{ trans('general.name') }}</th>
110+
<th>{{ trans('admin/settings/general.oauth_scopes') }}</th>
111+
<th></th>
99112
</tr>
100113
</thead>
101114

102115
<tbody>
103116
@foreach($authorized_tokens as $token)
104117
<tr>
105118
<!-- Client Name -->
106-
<td style="vertical-align: middle;">
119+
<td>
107120
{{ $token->client->name }}
108121
</td>
109122

110123
<!-- Scopes -->
111-
<td style="vertical-align: middle;">
124+
<td>
112125
@if(!$token->scopes)
113-
<span class="label label-default">No Scopes</span>
126+
<span class="label label-default">
127+
{{ trans('admin/settings/general.no_scopes') }}
128+
</span>
114129
@endif
115130
</td>
116131

117132
<!-- Revoke Button -->
118-
<td style="vertical-align: middle;">
119-
<a class="btn btn-sm btn-danger"
133+
<td>
134+
<a class="btn btn-sm btn-danger pull-right"
120135
wire:click="deleteToken('{{ $token->id }}')"
121136
>
122-
<i class="fas fa-trash"></i>
137+
<i class="fas fa-trash" aria-hidden="true"></i>
138+
<span class="sr-only">
139+
{{ trans('general.delete') }}
140+
</span>
123141
</a>
124142
</td>
125143
</tr>
@@ -130,8 +148,10 @@
130148
</div>
131149
</div>
132150
@endif
133-
</div>
134-
</div>
151+
152+
153+
154+
135155

136156
<!-- Create Client Modal -->
137157
<div class="modal fade" id="modal-create-client" tabindex="-1" role="dialog" wire:ignore.self>
@@ -141,7 +161,7 @@
141161
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
142162

143163
<h2 class="modal-title">
144-
Create Client
164+
{{ trans('admin/settings/general.create_client') }}
145165
</h2>
146166
</div>
147167

@@ -166,7 +186,9 @@
166186
<form class="form-horizontal" role="form">
167187
<!-- Name -->
168188
<div class="form-group">
169-
<label class="col-md-3 control-label" for="create-client-name">Name</label>
189+
<label class="col-md-3 control-label" for="create-client-name">
190+
{{ trans('general.name') }}
191+
</label>
170192

171193
<div class="col-md-7">
172194
<input id="create-client-name"
@@ -175,18 +197,17 @@
175197
class="form-control"
176198
wire:model="name"
177199
wire:keydown.enter="createClient"
178-
autofocus
179-
>
200+
autofocus>
180201

181202
<span class="help-block">
182-
Something your users will recognize and trust.
203+
{{ trans('admin/settings/general.oauth_name_help') }}
183204
</span>
184205
</div>
185206
</div>
186207

187208
<!-- Redirect URL -->
188209
<div class="form-group">
189-
<label class="col-md-3 control-label" for="redirect">Redirect URL</label>
210+
<label class="col-md-3 control-label" for="redirect">{{ trans('admin/settings/general.oauth_redirect_url') }}</label>
190211

191212
<div class="col-md-7">
192213
<input type="text"
@@ -198,7 +219,7 @@ class="form-control"
198219
>
199220

200221
<span class="help-block">
201-
Your application's authorization callback URL.
222+
{{ trans('admin/settings/general.oauth_callback_url') }}
202223
</span>
203224
</div>
204225
</div>
@@ -218,16 +239,17 @@ class="btn btn-primary"
218239
</div>
219240
</div>
220241
</div>
242+
</div>
243+
221244

222245
<!-- Edit Client Modal -->
223246
<div class="modal fade" id="modal-edit-client" tabindex="-1" role="dialog" wire:ignore.self>
224247
<div class="modal-dialog">
225248
<div class="modal-content">
226249
<div class="modal-header">
227250
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
228-
229251
<h4 class="modal-title">
230-
Edit Client
252+
{{ trans('general.update') }}
231253
</h4>
232254
</div>
233255

@@ -268,14 +290,14 @@ class="form-control"
268290
>
269291

270292
<span class="help-block">
271-
Something your users will recognize and trust.
293+
{{ trans('admin/settings/general.oauth_name_help') }}
272294
</span>
273295
</div>
274296
</div>
275297

276298
<!-- Redirect URL -->
277299
<div class="form-group">
278-
<label class="col-md-3 control-label" for="redirect">Redirect URL</label>
300+
<label class="col-md-3 control-label" for="redirect">{{ trans('admin/settings/general.oauth_redirect_url') }}</label>
279301

280302
<div class="col-md-7">
281303
<input
@@ -288,7 +310,7 @@ class="form-control"
288310
>
289311

290312
<span class="help-block">
291-
Your application's authorization callback URL.
313+
{{ trans('admin/settings/general.oauth_callback_url') }}
292314
</span>
293315
</div>
294316
</div>
@@ -330,4 +352,5 @@ class="btn btn-primary"
330352
331353
332354
</script>
333-
</div>
355+
</div>
356+

‎resources/views/models/bulk-delete.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
</td>
3737
<td class="col-md-1"><i class="fas fa-barcode" aria-hidden="true"></i></td>
38-
<td class="col-md-10">Name</td>
38+
<td class="col-md-10">{{ trans('general.name') }}</td>
3939
</tr>
4040
</thead>
4141
<tbody>

0 commit comments

Comments
 (0)