aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

#9: Storage locations is now fully up and working with Bootstrap 4

Browse Source
This commit is contained in:
Andy Heathershaw 2017-03-25 08:26:35 +00:00
parent a588ac2b31
commit 83ba49568e
16 changed files with 190 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Admin/StorageController.php
View File

@ -167,10 +167,11 @@ class StorageController extends Controller
* @param int $id * @param int $id
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function edit($id) public function edit(Request $request, $id)
{ {
$this->authorize('admin-access'); $this->authorize('admin-access');
/** @var Storage $storage */
$storage = Storage::where('id', intval($id))->first(); $storage = Storage::where('id', intval($id))->first();
if (is_null($storage)) if (is_null($storage))
{ {
@ -185,6 +186,11 @@ class StorageController extends Controller
} }
} }
if (!$request->session()->has('_old_input'))
{
$request->session()->flash('_old_input', $storage->toArray());
}
return Theme::render('admin.edit_storage', ['storage' => $storage]); return Theme::render('admin.edit_storage', ['storage' => $storage]);
} }

1
composer.json
View File

@ -7,7 +7,6 @@
"require": { "require": {
"php": ">=5.6.4", "php": ">=5.6.4",
"laravel/framework": "5.3.*", "laravel/framework": "5.3.*",
"laravelcollective/html": "5.3.*",
"rackspace/php-opencloud": "^1.16", "rackspace/php-opencloud": "^1.16",
"doctrine/dbal": "^2.5", "doctrine/dbal": "^2.5",
"aws/aws-sdk-php": "^3.19" "aws/aws-sdk-php": "^3.19"

3
config/app.php
View File

@ -168,7 +168,6 @@ return [
/* /*
* Package Service Providers... * Package Service Providers...
*/ */
Collective\Html\HtmlServiceProvider::class,
/* /*
* Application Service Providers... * Application Service Providers...
@ -227,8 +226,6 @@ return [
'View' => Illuminate\Support\Facades\View::class, 'View' => Illuminate\Support\Facades\View::class,
// Additional aliases added by AH // Additional aliases added by AH
'Form' => Collective\Html\FormFacade::class,
'Html' => Collective\Html\HtmlFacade::class,
'Image' => \App\Facade\Image::class, 'Image' => \App\Facade\Image::class,
'Theme' => \App\Facade\Theme::class, 'Theme' => \App\Facade\Theme::class,
'UserConfig' => \App\Facade\UserConfig::class 'UserConfig' => \App\Facade\UserConfig::class

5
public/css/blue-twilight.css vendored
View File

@ -1,6 +1,11 @@
.admin-sidebar-card { .admin-sidebar-card {
margin-bottom: 15px; margin-bottom: 15px;
} }
.card-header.card-danger {
color: #fff;
font-weight: bold;
}
html { html {
font-size: 14px !important; font-size: 14px !important;
} }

2
public/css/blue-twilight.min.css vendored
View File

@ -1,4 +1,4 @@
.admin-sidebar-card{margin-bottom:15px}html{font-size:14px !important}button,input,optgroup,select,textarea{cursor:pointer;font-family:inherit !important}.album-photo-cards .card{margin-bottom:15px}.container,.container-fluid{margin-top:20px}.tab-content{border:solid 1px #ddd;border-top:0;padding:20px}/*! .admin-sidebar-card{margin-bottom:15px}.card-header.card-danger{color:#fff;font-weight:bold}html{font-size:14px !important}button,input,optgroup,select,textarea{cursor:pointer;font-family:inherit !important}.album-photo-cards .card{margin-bottom:15px}.container,.container-fluid{margin-top:20px}.tab-content{border:solid 1px #ddd;border-top:0;padding:20px}/*!
* Bootstrap v4.0.0-alpha.6 (https://getbootstrap.com) * Bootstrap v4.0.0-alpha.6 (https://getbootstrap.com)
* Copyright 2011-2017 The Bootstrap Authors * Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc. * Copyright 2011-2017 Twitter, Inc.

7
public/js/blue-twilight.js
View File

@ -10243,6 +10243,13 @@ if ( !noGlobal ) {
return jQuery; return jQuery;
} ); } );
function StorageLocationViewModel()
{
this.el = '#storage-options';
this.data = {
storage_driver: 'LocalFilesystemSource'
};
}
/*! /*!
* Vue.js v2.2.0 * Vue.js v2.2.0
* (c) 2014-2017 Evan You * (c) 2014-2017 Evan You

10
public/js/blue-twilight.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
resources/assets/css/admin.css vendored
View File

@ -1,3 +1,8 @@
.admin-sidebar-card { .admin-sidebar-card {
margin-bottom: 15px; margin-bottom: 15px;
}
.card-header.card-danger {
color: #fff;
font-weight: bold;
} }

4
resources/views/themes/base/admin/create_storage.blade.php
View File

@ -51,10 +51,6 @@
@include(Theme::viewName('partials.admin_storages_filesystem_options')) @include(Theme::viewName('partials.admin_storages_filesystem_options'))
</div> </div>
<div v-if="storage_driver == 'OpenStackV1Source'">
@include(Theme::viewName('partials.admin_storages_openstack_v1_options'))
</div>
<div v-if="storage_driver == 'OpenStackSource'"> <div v-if="storage_driver == 'OpenStackSource'">
@include(Theme::viewName('partials.admin_storages_openstack_options')) @include(Theme::viewName('partials.admin_storages_openstack_options'))
</div> </div>

41
resources/views/themes/base/admin/delete_storage.blade.php
View File

@ -2,32 +2,31 @@
@section('title', trans('admin.delete_storage', ['name' => $storage->name])) @section('title', trans('admin.delete_storage', ['name' => $storage->name]))
@section('breadcrumb') @section('breadcrumb')
<div class="breadcrumb"> <li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
<div class="container"> <li class="breadcrumb-item"><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
<ol class="breadcrumb"> <li class="breadcrumb-item"><a href="{{ route('storage.index') }}">@lang('navigation.breadcrumb.storage')</a></li>
<li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li> <li class="breadcrumb-item active">@lang('navigation.breadcrumb.delete_storage')</li>
<li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
<li><a href="{{ route('storage.index') }}">@lang('navigation.breadcrumb.storage')</a></li>
<li class="active">@lang('navigation.breadcrumb.delete_storage')</li>
</ol>
</div>
</div>
@endsection @endsection
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-md-8 offset-md-2">
<h1>@yield('title')</h1> <div class="card card-outline-danger">
<p>@lang('admin.delete_storage_confirm', ['name' => $storage->name])</p> <div class="card-header card-danger">@yield('title')</div>
<div class="alert alert-danger"> <div class="card-block">
@lang('admin.delete_storage_warning') <p>@lang('admin.delete_storage_confirm', ['name' => $storage->name])</p>
</div> <p class="text-danger"><b>@lang('admin.delete_storage_warning')</b></p>
<div class="form-actions">
{!! Form::open(['route' => ['storage.destroy', $storage->id], 'method' => 'DELETE']) !!} <div class="text-right">
<a href="{{ route('storage.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a> <form action="{{ route('storage.destroy', [$storage->id]) }}" method="post" id="storage-options">
<button type="submit" class="btn btn-danger"><i class="fa fa-fw fa-trash"></i> @lang('forms.delete_action')</button> {{ method_field('DELETE') }}
{!! Form::close() !!} {{ csrf_field() }}
<a href="{{ route('storage.index') }}" class="btn btn-link">@lang('forms.cancel_action')</a>
<button type="submit" class="btn btn-danger"><i class="fa fa-fw fa-trash"></i> @lang('forms.delete_action')</button>
</form>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

113
resources/views/themes/base/admin/edit_storage.blade.php
View File

@ -2,80 +2,75 @@
@section('title', trans('admin.edit_storage', ['storage_name' => $storage->name])) @section('title', trans('admin.edit_storage', ['storage_name' => $storage->name]))
@section('breadcrumb') @section('breadcrumb')
<div class="breadcrumb"> <li class="breadcrumb-item"><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li>
<div class="container"> <li class="breadcrumb-item"><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
<ol class="breadcrumb"> <li class="breadcrumb-item"><a href="{{ route('storage.index') }}">@lang('navigation.breadcrumb.storage')</a></li>
<li><a href="{{ route('home') }}"><i class="fa fa-fw fa-home"></i></a></li> <li class="breadcrumb-item active">@lang('navigation.breadcrumb.edit_storage')</li>
<li><a href="{{ route('admin') }}">@lang('navigation.breadcrumb.admin')</a></li>
<li><a href="{{ route('storage.index') }}">@lang('navigation.breadcrumb.storage')</a></li>
<li class="active">@lang('navigation.breadcrumb.edit_storage')</li>
</ol>
</div>
</div>
@endsection @endsection
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col">
<h1>@yield('title')</h1> <h1>@yield('title')</h1>
<p>@lang('admin.edit_storage_intro', ['storage_name' => $storage->name])</p> <p>@lang('admin.edit_storage_intro', ['storage_name' => $storage->name])</p>
<hr/> <hr/>
{!! Form::model($storage, ['route' => ['storage.update', $storage->id], 'method' => 'PUT']) !!} <form action="{{ route('storage.update', [$storage->id]) }}" method="post" id="storage-options">
<div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}"> {{ method_field('PUT') }}
{!! Form::label('name', trans('forms.name_label'), ['class' => 'control-label']) !!} {{ csrf_field() }}
{!! Form::text('name', old('name'), ['class' => 'form-control']) !!}
@if ($errors->has('name')) <div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}">
<span class="help-block"> <label class="form-control-label" for="storage-name">@lang('forms.name_label')</label>
<strong>{{ $errors->first('name') }}</strong> <input type="text" class="form-control" id="storage-name" name="name" value="{{ old('name') }}">
</span>
@if ($errors->has('name'))
<div class="form-control-feedback">
<strong>{{ $errors->first('name') }}</strong>
</div>
@endif
</div>
<div class="checkbox">
<label>
<input type="checkbox" name="is_default"@if ($storage->is_default) checked="checked"@endif>
@lang('forms.default_storage_label')
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" name="is_active"@if ($storage->is_active) checked="checked"@endif>
@lang('forms.storage_active_label')
</label>
</div>
@if ($storage->source == 'LocalFilesystemSource')
<hr/>
@include(Theme::viewName('partials.admin_storages_filesystem_options'))
@endif @endif
</div>
<div class="checkbox"> @if ($storage->source == 'OpenStackSource')
<label> <hr/>
<input type="checkbox" name="is_default"@if ($storage->is_default) checked="checked"@endif> @include(Theme::viewName('partials.admin_storages_openstack_options'))
<strong>@lang('forms.default_storage_label')</strong> @endif
</label>
</div>
<div class="checkbox"> @if ($storage->source == 'AmazonS3Source')
<label> <hr/>
<input type="checkbox" name="is_active"@if ($storage->is_active) checked="checked"@endif> @include(Theme::viewName('partials.admin_storages_amazon_s3_options'))
<strong>@lang('forms.storage_active_label')</strong> @endif
</label>
</div>
@if ($storage->source == 'OpenStackSource') @if ($storage->source == 'RackspaceSource')
<hr/> <hr/>
@include(Theme::viewName('partials.admin_storages_openstack_options')) @include(Theme::viewName('partials.admin_storages_rackspace_options'))
@endif @endif
@if ($storage->source == 'AmazonS3Source') <div class="text-right">
<hr/> <a href="{{ route('storage.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
@include(Theme::viewName('partials.admin_storages_amazon_s3_options')) <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.save_action')</button>
@endif </div>
</form>
@if ($storage->source == 'RackspaceSource')
<hr/>
@include(Theme::viewName('partials.admin_storages_rackspace_options'))
@endif
<div class="form-actions">
<a href="{{ route('storage.index') }}" class="btn btn-default">@lang('forms.cancel_action')</a>
<button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.save_action')</button>
</div>
{!! Form::close() !!}
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@push('scripts')
<script type="text/javascript">
var viewModel = new StorageLocationsViewModel();
ko.applyBindings(viewModel);
</script>
@endpush

50
resources/views/themes/base/partials/admin_storages_amazon_s3_options.blade.php
View File

@ -1,25 +1,25 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('access_key') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('access_key') ? ' has-danger' : '' }}">
{!! Form::label('access_key', trans('forms.storage_access_key_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="access-key">@lang('forms.storage_access_key_label')</label>
{!! Form::text('access_key', old('access_key'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="access-key" name="access_key" value="{{ old('access_key') }}">
@if ($errors->has('access_key')) @if ($errors->has('access_key'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('access_key') }}</strong> <strong>{{ $errors->first('access_key') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('secret_key') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('secret_key') ? ' has-danger' : '' }}">
{!! Form::label('secret_key', trans('forms.storage_secret_key_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="secret-key">@lang('forms.storage_secret_key_label')</label>
{!! Form::text('secret_key', old('secret_key'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="secret-key" name="secret_key" value="{{ old('secret_key') }}">
@if ($errors->has('secret_key')) @if ($errors->has('secret_key'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('secret_key') }}</strong> <strong>{{ $errors->first('secret_key') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
@ -27,38 +27,38 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('container_name') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('container_name') ? ' has-danger' : '' }}">
{!! Form::label('container_name', trans('forms.storage_bucket_name_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="container-name">@lang('forms.storage_bucket_name_label')</label>
{!! Form::text('container_name', old('container_name'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="container-name" name="container_name" value="{{ old('container_name') }}">
@if ($errors->has('container_name')) @if ($errors->has('container_name'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('container_name') }}</strong> <strong>{{ $errors->first('container_name') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('service_region') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('service_region') ? ' has-danger' : '' }}">
{!! Form::label('service_region', trans('forms.storage_service_region_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="service-region">@lang('forms.storage_service_region_label')</label>
{!! Form::text('service_region', old('service_region'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="service-region" name="service_region" value="{{ old('service_region') }}">
@if ($errors->has('service_region')) @if ($errors->has('service_region'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('service_region') }}</strong> <strong>{{ $errors->first('service_region') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
</div> </div>
<div class="form-group{{ $errors->has('auth_url') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('auth_url') ? ' has-danger' : '' }}">
{!! Form::label('auth_url', trans('forms.storage_endpoint_url_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="auth-url">@lang('forms.storage_auth_url_label')</label>
{!! Form::text('auth_url', old('auth_url'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="auth-url" name="auth_url" value="{{ old('auth_url') }}">
@if ($errors->has('auth_url')) @if ($errors->has('auth_url'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('auth_url') }}</strong> <strong>{{ $errors->first('auth_url') }}</strong>
</span> </div>
@endif @endif
</div> </div>

2
resources/views/themes/base/partials/admin_storages_filesystem_options.blade.php
View File

@ -1,6 +1,6 @@
<div class="form-group{{ $errors->has('location') ? ' has-danger' : '' }}"> <div class="form-group{{ $errors->has('location') ? ' has-danger' : '' }}">
<label class="form-control-label" for="storage-location">@lang('forms.storage_location_label')</label> <label class="form-control-label" for="storage-location">@lang('forms.storage_location_label')</label>
<input type="text" class="form-control" id="storage-location" name="location" value="{{ old('location', $filesystem_default_location) }}"> <input type="text" class="form-control" id="storage-location" name="location" value="{{ old('location', isset($filesystem_default_location) ? $filesystem_default_location : '') }}">
@if ($errors->has('location')) @if ($errors->has('location'))
<div class="form-control-feedback"> <div class="form-control-feedback">

80
resources/views/themes/base/partials/admin_storages_openstack_options.blade.php
View File

@ -1,25 +1,25 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('auth_url') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('auth_url') ? ' has-danger' : '' }}">
{!! Form::label('auth_url', trans('forms.storage_auth_url_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="auth-url">@lang('forms.storage_auth_url_label')</label>
{!! Form::text('auth_url', old('auth_url'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="auth-url" name="auth_url" value="{{ old('auth_url') }}">
@if ($errors->has('auth_url')) @if ($errors->has('auth_url'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('auth_url') }}</strong> <strong>{{ $errors->first('auth_url') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('tenant_name') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('tenant_name') ? ' has-danger' : '' }}">
{!! Form::label('tenant_name', trans('forms.storage_tenant_name_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="tenant-name">@lang('forms.storage_tenant_name_label')</label>
{!! Form::text('tenant_name', old('tenant_name'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="tenant-name" name="tenant_name" value="{{ old('tenant_name') }}">
@if ($errors->has('tenant_name')) @if ($errors->has('tenant_name'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('tenant_name') }}</strong> <strong>{{ $errors->first('tenant_name') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
@ -27,26 +27,26 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('username') ? ' has-danger' : '' }}">
{!! Form::label('username', trans('forms.username_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="username">@lang('forms.username_label')</label>
{!! Form::text('username', old('username'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="username" name="username" value="{{ old('username') }}">
@if ($errors->has('username')) @if ($errors->has('username'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('username') }}</strong> <strong>{{ $errors->first('username') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }}">
{!! Form::label('password', trans('forms.password_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="password">@lang('forms.password_label')</label>
{!! Form::text('password', old('password'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="password" name="password" value="{{ old('password') }}">
@if ($errors->has('password')) @if ($errors->has('password'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('password') }}</strong> <strong>{{ $errors->first('password') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
@ -54,49 +54,49 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('service_name') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('service_name') ? ' has-danger' : '' }}">
{!! Form::label('service_name', trans('forms.storage_service_name_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="service-name">@lang('forms.storage_service_name_label')</label>
{!! Form::text('service_name', old('service_name'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="service-name" name="service_name" value="{{ old('service_name') }}">
@if ($errors->has('service_name')) @if ($errors->has('service_name'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('service_name') }}</strong> <strong>{{ $errors->first('service_name') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('service_region') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('service_region') ? ' has-danger' : '' }}">
{!! Form::label('service_region', trans('forms.storage_service_region_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="service-region">@lang('forms.storage_service_region_label')</label>
{!! Form::text('service_region', old('service_region'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="service-region" name="service_region" value="{{ old('service_region') }}">
@if ($errors->has('service_region')) @if ($errors->has('service_region'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('service_region') }}</strong> <strong>{{ $errors->first('service_region') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
</div> </div>
<div class="form-group{{ $errors->has('container_name') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('container_name') ? ' has-danger' : '' }}">
{!! Form::label('container_name', trans('forms.storage_container_name_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="container-name">@lang('forms.storage_container_name_label')</label>
{!! Form::text('container_name', old('container_name'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="container-name" name="container_name" value="{{ old('container_name') }}">
@if ($errors->has('container_name')) @if ($errors->has('container_name'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('container_name') }}</strong> <strong>{{ $errors->first('container_name') }}</strong>
</span> </div>
@endif @endif
</div> </div>
<div class="form-group{{ $errors->has('cdn_url') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('cdn_url') ? ' has-danger' : '' }}">
{!! Form::label('cdn_url', trans('forms.storage_cdn_url_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="cdn-url">@lang('forms.storage_cdn_url_label')</label>
{!! Form::text('cdn_url', old('cdn_url'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="cdn-url" name="cdn_url" value="{{ old('cdn_url') }}">
@if ($errors->has('cdn_url')) @if ($errors->has('cdn_url'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('cdn_url') }}</strong> <strong>{{ $errors->first('cdn_url') }}</strong>
</span> </div>
@endif @endif
</div> </div>

102
resources/views/themes/base/partials/admin_storages_openstack_v1_options.blade.php
View File

@ -1,102 +0,0 @@
<div class="row">
<div class="col-md-6">
<div class="form-group{{ $errors->has('auth_url') ? ' has-error' : '' }}">
{!! Form::label('auth_url', trans('forms.storage_auth_url_label'), ['class' => 'control-label']) !!}
{!! Form::text('auth_url', old('auth_url'), ['class' => 'form-control']) !!}
@if ($errors->has('auth_url'))
<span class="help-block">
<strong>{{ $errors->first('auth_url') }}</strong>
</span>
@endif
</div>
</div>
<div class="col-md-6">
<div class="form-group{{ $errors->has('tenant_name') ? ' has-error' : '' }}">
{!! Form::label('tenant_name', trans('forms.storage_tenant_name_label'), ['class' => 'control-label']) !!}
{!! Form::text('tenant_name', old('tenant_name'), ['class' => 'form-control']) !!}
@if ($errors->has('tenant_name'))
<span class="help-block">
<strong>{{ $errors->first('tenant_name') }}</strong>
</span>
@endif
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
{!! Form::label('username', trans('forms.username_label'), ['class' => 'control-label']) !!}
{!! Form::text('username', old('username'), ['class' => 'form-control']) !!}
@if ($errors->has('username'))
<span class="help-block">
<strong>{{ $errors->first('username') }}</strong>
</span>
@endif
</div>
</div>
<div class="col-md-6">
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
{!! Form::label('password', trans('forms.password_label'), ['class' => 'control-label']) !!}
{!! Form::text('password', old('password'), ['class' => 'form-control']) !!}
@if ($errors->has('password'))
<span class="help-block">
<strong>{{ $errors->first('password') }}</strong>
</span>
@endif
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group{{ $errors->has('service_name') ? ' has-error' : '' }}">
{!! Form::label('service_name', trans('forms.storage_service_name_label'), ['class' => 'control-label']) !!}
{!! Form::text('service_name', old('service_name'), ['class' => 'form-control']) !!}
@if ($errors->has('service_name'))
<span class="help-block">
<strong>{{ $errors->first('service_name') }}</strong>
</span>
@endif
</div>
</div>
<div class="col-md-6">
<div class="form-group{{ $errors->has('service_region') ? ' has-error' : '' }}">
{!! Form::label('service_region', trans('forms.storage_service_region_label'), ['class' => 'control-label']) !!}
{!! Form::text('service_region', old('service_region'), ['class' => 'form-control']) !!}
@if ($errors->has('service_region'))
<span class="help-block">
<strong>{{ $errors->first('service_region') }}</strong>
</span>
@endif
</div>
</div>
</div>
<div class="form-group{{ $errors->has('container_name') ? ' has-error' : '' }}">
{!! Form::label('container_name', trans('forms.storage_container_name_label'), ['class' => 'control-label']) !!}
{!! Form::text('container_name', old('container_name'), ['class' => 'form-control']) !!}
@if ($errors->has('container_name'))
<span class="help-block">
<strong>{{ $errors->first('container_name') }}</strong>
</span>
@endif
</div>
<div class="form-group{{ $errors->has('cdn_url') ? ' has-error' : '' }}">
{!! Form::label('cdn_url', trans('forms.storage_cdn_url_label'), ['class' => 'control-label']) !!}
{!! Form::text('cdn_url', old('cdn_url'), ['class' => 'form-control']) !!}
@if ($errors->has('cdn_url'))
<span class="help-block">
<strong>{{ $errors->first('cdn_url') }}</strong>
</span>
@endif
</div>

40
resources/views/themes/base/partials/admin_storages_rackspace_options.blade.php
View File

@ -1,25 +1,25 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('username') ? ' has-danger' : '' }}">
{!! Form::label('username', trans('forms.username_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="username">@lang('forms.username_label')</label>
{!! Form::text('username', old('username'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="username" name="username" value="{{ old('username') }}">
@if ($errors->has('username')) @if ($errors->has('username'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('username') }}</strong> <strong>{{ $errors->first('username') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }}">
{!! Form::label('password', trans('forms.storage_api_key_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="password">@lang('forms.password_label')</label>
{!! Form::text('password', old('password'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="password" name="password" value="{{ old('password') }}">
@if ($errors->has('password')) @if ($errors->has('password'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('password') }}</strong> <strong>{{ $errors->first('password') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
@ -27,26 +27,26 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('service_region') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('service_region') ? ' has-danger' : '' }}">
{!! Form::label('service_region', trans('forms.storage_service_region_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="service-region">@lang('forms.storage_service_region_label')</label>
{!! Form::text('service_region', old('service_region'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="service-region" name="service_region" value="{{ old('service_region') }}">
@if ($errors->has('service_region')) @if ($errors->has('service_region'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('service_region') }}</strong> <strong>{{ $errors->first('service_region') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group{{ $errors->has('container_name') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('container_name') ? ' has-danger' : '' }}">
{!! Form::label('container_name', trans('forms.storage_container_name_label'), ['class' => 'control-label']) !!} <label class="form-control-label" for="container-name">@lang('forms.storage_container_name_label')</label>
{!! Form::text('container_name', old('container_name'), ['class' => 'form-control']) !!} <input type="text" class="form-control" id="container-name" name="container_name" value="{{ old('container_name') }}">
@if ($errors->has('container_name')) @if ($errors->has('container_name'))
<span class="help-block"> <div class="form-control-feedback">
<strong>{{ $errors->first('container_name') }}</strong> <strong>{{ $errors->first('container_name') }}</strong>
</span> </div>
@endif @endif
</div> </div>
</div> </div>