Sidebar and API View tweaks

This commit is contained in:
Dane Everitt 2017-01-20 23:48:12 -05:00
parent 3d2278ba3e
commit 95f574ec67
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 71 additions and 67 deletions

View file

@ -24,7 +24,7 @@ return [
'header' => 'API Access', 'header' => 'API Access',
'header_sub' => 'Manage your API access keys.', 'header_sub' => 'Manage your API access keys.',
'list' => 'API Keys', 'list' => 'API Keys',
'create_new' => 'Create new API key', 'create_new' => 'Create New API key',
], ],
'new' => [ 'new' => [
'header' => 'New API Key', 'header' => 'New API Key',
@ -32,7 +32,7 @@ return [
'form_title' => 'Details', 'form_title' => 'Details',
'descriptive_memo' => [ 'descriptive_memo' => [
'title' => 'Descriptive Memo', 'title' => 'Descriptive Memo',
'description' => 'Enter a breif description of what this API key will be used for.' 'description' => 'Enter a brief description of what this API key will be used for.'
], ],
'allowed_ips' => [ 'allowed_ips' => [
'title' => 'Allowed IPs', 'title' => 'Allowed IPs',
@ -103,7 +103,7 @@ return [
], ],
'view' => [ 'view' => [
'title' => 'Show Single Server', 'title' => 'Show Single Server',
'description' => 'Allows viewing details about a specific server including the daemon_token as current process information.', 'description' => 'Allows viewing details about a specific server including the daemon_token as well as current process information.',
], ],
'list' => [ 'list' => [
'title' => 'List Servers', 'title' => 'List Servers',

View file

@ -89,14 +89,14 @@
<div class="box-title">@lang('base.api.new.base.title')</div> <div class="box-title">@lang('base.api.new.base.title')</div>
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="permissions[]" type="checkbox" value="user:*"> <input name="permissions[]" type="checkbox" value="user:*">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.base.information.title')</strong> <strong>@lang('base.api.new.base.information.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.base.information.description') @lang('base.api.new.base.information.description')
</small><p> </p>
</label> </label>
</div> </div>
</div> </div>
@ -107,54 +107,54 @@
<div class="box-title">@lang('base.api.new.user_management.title')</div> <div class="box-title">@lang('base.api.new.user_management.title')</div>
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:users.list"> <input name="adminPermissions[]" type="checkbox" value="admin:users.list">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.user_management.list.title')</strong> <strong>@lang('base.api.new.user_management.list.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.user_management.list.description') @lang('base.api.new.user_management.list.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:users.create"> <input name="adminPermissions[]" type="checkbox" value="admin:users.create">
<span class="label label-default">POST</span> <span class="label label-default">POST</span>
<strong>@lang('base.api.new.user_management.create.title')</strong> <strong>@lang('base.api.new.user_management.create.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.user_management.create.description') @lang('base.api.new.user_management.create.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:users.view"> <input name="adminPermissions[]" type="checkbox" value="admin:users.view">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.user_management.view.title')</strong> <strong>@lang('base.api.new.user_management.view.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.user_management.view.description') @lang('base.api.new.user_management.view.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:users.update"> <input name="adminPermissions[]" type="checkbox" value="admin:users.update">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.user_management.update.title')</strong> <strong>@lang('base.api.new.user_management.update.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.user_management.update.description') @lang('base.api.new.user_management.update.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:users.delete"> <input name="adminPermissions[]" type="checkbox" value="admin:users.delete">
<span class="label label-danger">DELETE</span> <span class="label label-danger">DELETE</span>
<strong>@lang('base.api.new.user_management.delete.title')</strong> <strong>@lang('base.api.new.user_management.delete.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.user_management.delete.description') @lang('base.api.new.user_management.delete.description')
</small><p> </p>
</label> </label>
</div> </div>
</div> </div>
@ -164,54 +164,54 @@
<div class="box-title">@lang('base.api.new.node_management.title')</div> <div class="box-title">@lang('base.api.new.node_management.title')</div>
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:nodes.list"> <input name="adminPermissions[]" type="checkbox" value="admin:nodes.list">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.node_management.list.title')</strong> <strong>@lang('base.api.new.node_management.list.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.node_management.list.description') @lang('base.api.new.node_management.list.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:nodes.create"> <input name="adminPermissions[]" type="checkbox" value="admin:nodes.create">
<span class="label label-default">POST</span> <span class="label label-default">POST</span>
<strong>@lang('base.api.new.node_management.create.title')</strong> <strong>@lang('base.api.new.node_management.create.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.node_management.create.description') @lang('base.api.new.node_management.create.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:nodes.view"> <input name="adminPermissions[]" type="checkbox" value="admin:nodes.view">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.node_management.view.title')</strong> <strong>@lang('base.api.new.node_management.view.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.node_management.view.description') @lang('base.api.new.node_management.view.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:nodes.allocations"> <input name="adminPermissions[]" type="checkbox" value="admin:nodes.allocations">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.node_management.allocations.title')</strong> <strong>@lang('base.api.new.node_management.allocations.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.node_management.allocations.description') @lang('base.api.new.node_management.allocations.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:nodes.delete"> <input name="adminPermissions[]" type="checkbox" value="admin:nodes.delete">
<span class="label label-danger">DELETE</span> <span class="label label-danger">DELETE</span>
<strong>@lang('base.api.new.node_management.delete.title')</strong> <strong>@lang('base.api.new.node_management.delete.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.node_management.delete.description') @lang('base.api.new.node_management.delete.description')
</small><p> </p>
</label> </label>
</div> </div>
</div> </div>
@ -229,9 +229,9 @@
<input name="permissions[]" type="checkbox" value="user:server"> <input name="permissions[]" type="checkbox" value="user:server">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.server_management.server.title')</strong> <strong>@lang('base.api.new.server_management.server.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.server_management.server.description') @lang('base.api.new.server_management.server.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
@ -239,9 +239,9 @@
<input name="permissions[]" type="checkbox" value="user:server.power"> <input name="permissions[]" type="checkbox" value="user:server.power">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.server_management.power.title')</strong> <strong>@lang('base.api.new.server_management.power.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.server_management.power.description') @lang('base.api.new.server_management.power.description')
</small><p> </p>
</label> </label>
</div> </div>
@if(Auth::user()->isRootAdmin()) @if(Auth::user()->isRootAdmin())
@ -250,10 +250,10 @@
<input name="adminPermissions[]" type="checkbox" value="admin:servers.view"> <input name="adminPermissions[]" type="checkbox" value="admin:servers.view">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.server_management.view.title')</strong> <strong>@lang('base.api.new.server_management.view.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
<span class="label label-danger">@lang('strings.danger')</span> <span class="label label-danger">@lang('strings.danger')</span>
@lang('base.api.new.server_management.view.description') @lang('base.api.new.server_management.view.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
@ -261,9 +261,9 @@
<input name="adminPermissions[]" type="checkbox" value="admin:servers.list"> <input name="adminPermissions[]" type="checkbox" value="admin:servers.list">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.server_management.list.title')</strong> <strong>@lang('base.api.new.server_management.list.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.server_management.list.description') @lang('base.api.new.server_management.list.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
@ -271,9 +271,9 @@
<input name="adminPermissions[]" type="checkbox" value="admin:servers.create"> <input name="adminPermissions[]" type="checkbox" value="admin:servers.create">
<span class="label label-default">POST</span> <span class="label label-default">POST</span>
<strong>@lang('base.api.new.server_management.create.title')</strong> <strong>@lang('base.api.new.server_management.create.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.server_management.create.description') @lang('base.api.new.server_management.create.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
@ -281,9 +281,9 @@
<input name="adminPermissions[]" type="checkbox" value="admin:servers.config"> <input name="adminPermissions[]" type="checkbox" value="admin:servers.config">
<span class="label label-default">PATCH</span> <span class="label label-default">PATCH</span>
<strong>@lang('base.api.new.server_management.config.title')</strong> <strong>@lang('base.api.new.server_management.config.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.server_management.config.description') @lang('base.api.new.server_management.config.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
@ -291,9 +291,9 @@
<input name="adminPermissions[]" type="checkbox" value="admin:servers.build"> <input name="adminPermissions[]" type="checkbox" value="admin:servers.build">
<span class="label label-default">PATCH</span> <span class="label label-default">PATCH</span>
<strong>@lang('base.api.new.server_management.build.title')</strong> <strong>@lang('base.api.new.server_management.build.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.server_management.build.description') @lang('base.api.new.server_management.build.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
@ -301,9 +301,9 @@
<input name="adminPermissions[]" type="checkbox" value="admin:servers.suspend"> <input name="adminPermissions[]" type="checkbox" value="admin:servers.suspend">
<span class="label label-default">POST</span> <span class="label label-default">POST</span>
<strong>@lang('base.api.new.server_management.suspend.title')</strong> <strong>@lang('base.api.new.server_management.suspend.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.server_management.suspend.description') @lang('base.api.new.server_management.suspend.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
@ -311,9 +311,9 @@
<input name="adminPermissions[]" type="checkbox" value="admin:servers.unsuspend"> <input name="adminPermissions[]" type="checkbox" value="admin:servers.unsuspend">
<span class="label label-default">POST</span> <span class="label label-default">POST</span>
<strong>@lang('base.api.new.server_management.unsuspend.title')</strong> <strong>@lang('base.api.new.server_management.unsuspend.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.server_management.unsuspend.description') @lang('base.api.new.server_management.unsuspend.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
@ -321,9 +321,9 @@
<input name="adminPermissions[]" type="checkbox" value="admin:servers.delete"> <input name="adminPermissions[]" type="checkbox" value="admin:servers.delete">
<span class="label label-danger">DELETE</span> <span class="label label-danger">DELETE</span>
<strong>@lang('base.api.new.server_management.delete.title')</strong> <strong>@lang('base.api.new.server_management.delete.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
@lang('base.api.new.server_management.delete.description') @lang('base.api.new.server_management.delete.description')
</small><p> </p>
</label> </label>
</div> </div>
@endif @endif
@ -335,26 +335,26 @@
<div class="box-title">@lang('base.api.new.service_management.title')</div> <div class="box-title">@lang('base.api.new.service_management.title')</div>
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:services.list"> <input name="adminPermissions[]" type="checkbox" value="admin:services.list">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.service_management.list.title')</strong> <strong>@lang('base.api.new.service_management.list.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
<span class="label label-danger">@lang('strings.danger')</span> <span class="label label-danger">@lang('strings.danger')</span>
@lang('base.api.new.service_management.list.description') @lang('base.api.new.service_management.list.description')
</small><p> </p>
</label> </label>
</div> </div>
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:services.view"> <input name="adminPermissions[]" type="checkbox" value="admin:services.view">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.service_management.view.title')</strong> <strong>@lang('base.api.new.service_management.view.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
<span class="label label-danger">@lang('strings.danger')</span> <span class="label label-danger">@lang('strings.danger')</span>
@lang('base.api.new.service_management.view.description') @lang('base.api.new.service_management.view.description')
</small><p> </p>
</label> </label>
</div> </div>
</div> </div>
@ -364,15 +364,15 @@
<div class="box-title">@lang('base.api.new.location_management.title')</div> <div class="box-title">@lang('base.api.new.location_management.title')</div>
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="checkbox highlight"> <div class="checkbox">
<label> <label>
<input name="adminPermissions[]" type="checkbox" value="admin:locations.list"> <input name="adminPermissions[]" type="checkbox" value="admin:locations.list">
<span class="label label-default">GET</span> <span class="label label-default">GET</span>
<strong>@lang('base.api.new.location_management.list.title')</strong> <strong>@lang('base.api.new.location_management.list.title')</strong>
<p class="help-block"><small> <p class="text-muted small">
<span class="label label-danger">@lang('strings.danger')</span> <span class="label label-danger">@lang('strings.danger')</span>
@lang('base.api.new.location_management.list.description') @lang('base.api.new.location_management.list.description')
</small><p> </p>
</label> </label>
</div> </div>
</div> </div>

View file

@ -123,7 +123,7 @@
<i class="fa fa-lock"></i> <span>@lang('navigation.account.security_controls')</span> <i class="fa fa-lock"></i> <span>@lang('navigation.account.security_controls')</span>
</a> </a>
</li> </li>
<li class="{{ Route::currentRouteName() !== 'account.api' ?: 'active' }}"> <li class="{{ (Route::currentRouteName() !== 'account.api' && Route::currentRouteName() !== 'account.api.new') ?: 'active' }}">
<a href="{{ route('account.api')}}"> <a href="{{ route('account.api')}}">
<i class="fa fa-code"></i> <span>@lang('navigation.account.api_access')</span> <i class="fa fa-code"></i> <span>@lang('navigation.account.api_access')</span>
</a> </a>
@ -157,7 +157,11 @@
<li class="{{ Route::currentRouteName() !== 'server.files.add' ?: 'active' }}"><a href="{{ route('server.files.add', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.create_file')</a></li> <li class="{{ Route::currentRouteName() !== 'server.files.add' ?: 'active' }}"><a href="{{ route('server.files.add', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.create_file')</a></li>
</ul> </ul>
</li> </li>
<li> <li
@if(in_array(Route::currentRouteName(), ['server.subusers', 'server.subusers.new', 'server.subusers.view']))
class="active"
@endif
>
<a href="{{ route('server.subusers', $server->uuidShort)}}"> <a href="{{ route('server.subusers', $server->uuidShort)}}">
<i class="fa fa-users"></i> <span>Subusers</span> <i class="fa fa-users"></i> <span>Subusers</span>
</a> </a>