Contribution to feature/new-theme (#254)

* add translation to navigation

* redesign base.api.index view
add translations

* remove license derp

* translate never in base.api.index view

* simplify user drop down for now
add translations
This commit is contained in:
Jakob 2017-01-18 00:21:05 +01:00 committed by Dane Everitt
parent 515e543c7f
commit 31b4589eab
5 changed files with 149 additions and 21 deletions

View File

@ -7,6 +7,14 @@ return [
'header_sub' => 'Servers you own and have access to.',
'list' => 'Server List',
],
'api' => [
'index' => [
'header' => 'API Access',
'header_sub' => 'Manage your API access keys.',
'list' => 'API Keys',
'create_new' => 'Create new API key'
],
],
'account' => [
'header' => 'Your Account',
'header_sub' => 'Manage your account details.',

View File

@ -0,0 +1,27 @@
<?php
return [
'home' => 'Home',
'account' => [
'header' => 'ACCOUNT MANAGEMENT',
'my_account' => 'My Account',
'security_controls' => 'Security Controls',
'api_access' => 'API Access',
'my_servers' => 'My Servers'
],
'server' => [
'header' => 'SERVER MANAGEMENT',
'console' => 'Console',
'file_management' => 'File Management',
'file_browser' => 'File Browser',
'create_file' => 'Create File',
'upload_files' => 'Upload Files',
'subusers' => 'Subusers',
'task_management' => 'Task Management',
'configuration' => 'Configuration',
'port_allocations' => 'Port Allocations',
'sftp_settings' => 'SFTP Settings',
'startup_parameters' => 'Startup Parameters',
'databases' => 'Databases'
],
];

View File

@ -28,4 +28,12 @@ return [
'configuration' => 'Configuration',
'sftp' => 'SFTP',
'databases' => 'Databases',
'memo' => 'Memo',
'created' => 'Created',
'expires' => 'Expires',
'public_key' => 'Public key',
'api_access' => 'Api Access',
'never' => 'never',
'sign_out' => 'Sign out',
'admin_control' => 'Admin Control'
];

View File

@ -0,0 +1,81 @@
{{-- Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com> --}}
{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}}
{{-- of this software and associated documentation files (the "Software"), to deal --}}
{{-- in the Software without restriction, including without limitation the rights --}}
{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}}
{{-- copies of the Software, and to permit persons to whom the Software is --}}
{{-- furnished to do so, subject to the following conditions: --}}
{{-- The above copyright notice and this permission notice shall be included in all --}}
{{-- copies or substantial portions of the Software. --}}
{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}}
{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}}
{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}}
{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}}
{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}}
{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}}
{{-- SOFTWARE. --}}
@extends('layouts.master')
@section('title')
{{ trans('base.api.index.header') }}
@endsection
@section('content-header')
<h1>{{ trans('base.api.index.header') }}<small>{{ trans('base.api.index.header_sub')}}</small></h1>
<ol class="breadcrumb">
<li><a href="{{ route('index') }}">{{ trans('strings.home') }}</a></li>
<li class="active">{{ trans('strings.api_access') }}</li>
</ol>
@endsection
@section('content')
<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
<h3 class="box-title">{{ trans('base.api.index.list')}}</h3>
</div>
<div class="box-body table-responsive no-padding">
<table class="table table-hover">
<tbody>
<tr>
<th>{{ trans('strings.public_key') }}</th>
<th>{{ trans('strings.memo') }}</th>
<th class="text-center hidden-sm hidden-xs">{{ trans('strings.created') }}</th>
<th class="text-center hidden-sm hidden-xs">{{ trans('strings.expires') }}</th>
<th></th>
</tr>
@foreach ($keys as $key)
<tr>
<td><code>{{ $key->public }}</code></td>
<td>{{ $key->memo }}</td>
<td class="text-center hidden-sm hidden-xs">
{{ (new Carbon($key->created_at))->toDayDateTimeString() }}
</td>
<td class="text-center hidden-sm hidden-xs">
@if(is_null($key->expires_at))
<span class="label label-default">@lang('strings.never')</span>
@else
{{ (new Carbon($key->expires_at))->toDayDateTimeString() }}
@endif
</td>
<td class="text-center">
<a href="#delete" class="text-danger" data-action="delete" data-attr="{{ $key->public}}"><i class="fa fa-trash"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="box-footer">
<a href="{{ route('account.api.new') }}">
<button class="btn btn-sm btn-success">{{ trans('base.api.index.create_new') }}</button>
</a>
</div>
</div>
</div>
</div>
@endsection

View File

@ -55,12 +55,16 @@
</a>
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<li class="dropdown user user-menu">
<li class="dropdown user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<img src="https://www.gravatar.com/avatar/{{ md5(Auth::user()->email) }}?s=160" class="user-image" alt="User Image">
<span class="hidden-xs">{{ Auth::user()->name_first }} {{ Auth::user()->name_last }}</span>
<span class="hidden-xs">{{ Auth::user()->name_first }} {{ Auth::user()->name_last }}</span> <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<ul class="dropdown-menu" role="menu">
<li><a href="{{ route('admin.index') }}">@lang('strings.admin_control')</a></li>
<li><a href="{{ route('auth.logout') }}">@lang('strings.sign_out')</a></li>
</ul>
{{-- <ul class="dropdown-menu">
<li class="user-header">
<p>
<small>Member since Nov. 2012</small>
@ -87,7 +91,7 @@
<a href="{{ route('auth.logout') }}" class="btn btn-default btn-flat">Sign out</a>
</div>
</li>
</ul>
</ul> --}}
</li>
<li>
<a href="#" data-toggle="control-sidebar"><i class="fa fa-gears" style="margin-top:4px;padding-bottom:2px;"></i></a>
@ -107,46 +111,46 @@
</div>
@endif
<ul class="sidebar-menu">
<li class="header">ACCOUNT MANAGEMENT</li>
<li class="header">{{ trans('navigation.account.header') }}</li>
<li class="{{ Route::currentRouteName() !== 'account' ?: 'active' }}">
<a href="{{ route('account')}}">
<i class="fa fa-user"></i> <span>My Account</span>
<i class="fa fa-user"></i> <span>{{ trans('navigation.account.my_account') }}</span>
</a>
</li>
<li class="{{ Route::currentRouteName() !== 'account.security' ?: 'active' }}">
<a href="{{ route('account.security')}}">
<i class="fa fa-lock"></i> <span>Security Controls</span>
<i class="fa fa-lock"></i> <span>{{ trans('navigation.account.security_controls') }}</span>
</a>
</li>
<li class="{{ Route::currentRouteName() !== 'account.api' ?: 'active' }}">
<a href="{{ route('account.api')}}">
<i class="fa fa-code"></i> <span>API Access</span>
<i class="fa fa-code"></i> <span>{{ trans('navigation.account.api_access') }}</span>
</a>
</li>
<li class="{{ Route::currentRouteName() !== 'index' ?: 'active' }}">
<a href="{{ route('index')}}">
<i class="fa fa-server"></i> <span>My Servers</span>
<i class="fa fa-server"></i> <span>{{ trans('navigation.account.my_servers') }}</span>
</a>
</li>
@if (isset($server->name) && isset($node->name))
<li class="header">SERVER MANAGEMENT</li>
<li class="header">{{ trans('navigation.server.header') }}</li>
<li class="{{ Route::currentRouteName() !== 'server.index' ?: 'active' }}">
<a href="{{ route('server.index', $server->uuidShort) }}">
<i class="fa fa-terminal"></i> <span>Console</span>
<i class="fa fa-terminal"></i> <span>{{ trans('navigation.server.console') }}</span>
</a>
</li>
<li class="treeview {{ Route::currentRouteName() !== 'server.files.index' ?: 'active' }}">
<a href="#">
<i class="fa fa-files-o"></i>
<span>File Management</span>
<span>{{ trans('navigation.server.file_management') }}</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="{{ route('server.files.index', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> File Browser</a></li>
<li><a href="{{ route('server.files.add', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> Create File</a></li>
<li><a href=""><i class="fa fa-angle-right"></i> Upload Files</a></li>
<li><a href="{{ route('server.files.index', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> {{ trans('navigation.server.file_browser') }}</a></li>
<li><a href="{{ route('server.files.add', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> {{ trans('navigation.server.create_file') }}</a></li>
<li><a href=""><i class="fa fa-angle-right"></i> {{ trans('navigation.server.upload_files') }}</a></li>
</ul>
</li>
<li>
@ -156,7 +160,7 @@
</li>
<li>
<a href="{{ route('server.tasks', $server->uuidShort)}}">
<i class="fa fa-clock-o"></i> <span>Task Management</span>
<i class="fa fa-clock-o"></i> <span>{{ trans('navigation.server.task_management') }}</span>
<span class="pull-right-container">
<span class="label label-primary pull-right">4</span>
</span>
@ -169,16 +173,16 @@
">
<a href="#">
<i class="fa fa-gears"></i>
<span>Configuration</span>
<span>{{ trans('navigation.server.configuration') }}</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href=""><i class="fa fa-angle-right"></i> Port Allocations</a></li>
<li class="{{ Route::currentRouteName() !== 'server.settings.sftp' ?: 'active' }}"><a href="{{ route('server.settings.sftp', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> SFTP Settings</a></li>
<li><a href=""><i class="fa fa-angle-right"></i> Startup Parameters</a></li>
<li class="{{ Route::currentRouteName() !== 'server.settings.databases' ?: 'active' }}"><a href="{{ route('server.settings.databases', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> Databases</a></li>
<li><a href=""><i class="fa fa-angle-right"></i> {{ trans('navigation.server.port_allocations') }}</a></li>
<li class="{{ Route::currentRouteName() !== 'server.settings.sftp' ?: 'active' }}"><a href="{{ route('server.settings.sftp', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> {{ trans('navigation.server.sftp_settings') }}</a></li>
<li><a href=""><i class="fa fa-angle-right"></i> {{ trans('navigation.server.startup_parameters') }}</a></li>
<li class="{{ Route::currentRouteName() !== 'server.settings.databases' ?: 'active' }}"><a href="{{ route('server.settings.databases', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> {{ trans('navigation.server.databases') }}</a></li>
</ul>
</li>
@endif