Template adjustments

This commit is contained in:
Dane Everitt 2016-01-04 16:48:22 -05:00
parent 98d2a1e1fd
commit 1a55532f95
21 changed files with 95 additions and 194 deletions

View File

@ -5,7 +5,7 @@
@endsection
@section('content')
<div class="col-md-9">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="/admin">Admin Control</a></li>
<li class="active">Accounts</li>

View File

@ -5,22 +5,12 @@
@endsection
@section('content')
<div class="col-md-9">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="/admin">Admin Controls</a></li>
<li><a href="/admin/accounts">Accounts</a></li>
<li class="active">Add New Account</li>
</ul>
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
<h3>Create New Account</h3><hr />
<form action="new" method="post">
<fieldset>

View File

@ -5,30 +5,12 @@
@endsection
@section('content')
<div class="col-md-9">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="/admin">Admin Controls</a></li>
<li><a href="/admin/accounts">Accounts</a></li>
<li class="active">{{ $user->email }}</li>
</ul>
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{!! $message !!}
</div>
@endforeach
@endforeach
<h3>Viewing User: {{ $user->email }}</h3><hr />
<div class="row">
<div class="col-md-12">

View File

@ -5,7 +5,7 @@
@endsection
@section('content')
<div class="col-md-9">
<div class="col-md-12">
<ul class="breadcrumb">
<li class="active">Admin Control</li>
</ul>

View File

@ -5,19 +5,11 @@
@endsection
@section('content')
<div class="col-md-9">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="/admin">Admin Control</a></li>
<li class="active">Servers</li>
</ul>
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{!! $message !!}
</div>
@endforeach
@endforeach
<h3>All Servers</h3><hr />
<table class="table table-bordered table-hover">
<thead>

View File

@ -5,30 +5,12 @@
@endsection
@section('content')
<div class="col-md-9">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="/admin">Admin Control</a></li>
<li><a href="/admin/servers">Servers</a></li>
<li class="active">Create New Server</li>
</ul>
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('base.validation_error') }}<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{!! $message !!}
</div>
@endforeach
@endforeach
<h3>Create New Server</h3><hr />
<form action="/admin/servers/new" method="POST">
<div class="well">

View File

@ -5,30 +5,12 @@
@endsection
@section('content')
<div class="col-md-9">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="/admin">Admin Control</a></li>
<li><a href="/admin/servers">Servers</a></li>
<li class="active">{{ $server->name }} ({{ $server->uuidShort}})</li>
</ul>
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('base.validation_error') }}<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{!! $message !!}
</div>
@endforeach
@endforeach
<ul class="nav nav-tabs tabs_with_panel" id="config_tabs">
<li class="active"><a href="#tab_about" data-toggle="tab">About</a></li>
<li><a href="#tab_details" data-toggle="tab">Details</a></li>

View File

@ -14,24 +14,6 @@
<form action="/auth/login" method="POST" id="login-form">
<legend>{{ trans('strings.login') }}</legend>
<fieldset>
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{{ $message }}
</div>
@endforeach
@endforeach
<div class="form-group">
<label for="email" class="control-label">{{ trans('strings.email') }}</label>
<div>

View File

@ -14,16 +14,6 @@
<form action="/auth/password" method="POST">
<legend>{{ trans('auth.resetpassword') }}</legend>
<fieldset>
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
@if (session('status'))
<div class="alert alert-success">
<strong>{{ trans('strings.success') }}!</strong> {{ trans('auth.emailsent') }}

View File

@ -14,16 +14,6 @@
<form action="/auth/password/verify" method="POST">
<legend>{{ trans('auth.resetpassword') }}</legend>
<fieldset>
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
<input type="hidden" name="token" value="{{ $token }}">
<div class="form-group">
<label for="email" class="control-label">{{ trans('strings.email') }}</label>

View File

@ -6,26 +6,7 @@
@endsection
@section('content')
<div class="col-md-9">
@if (count($errors) > 0)
<div class="alert alert-danger alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{{ trans('base.form_error') }}
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{{ $message }}
</div>
@endforeach
@endforeach
<div class="col-md-12">
<div class="row">
<div class="col-md-6">
<h3 class="nopad">{{ trans('base.account.update_pass') }}</h3><hr />

View File

@ -6,15 +6,7 @@
@endsection
@section('content')
<div class="col-md-9">
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{{ $message }}
</div>
@endforeach
@endforeach
<div class="col-md-12">
@if (Auth::user()->root_admin == 1)
<div class="alert alert-info">{{ trans('base.view_as_admin') }}</div>
@endif

View File

@ -6,7 +6,7 @@
@endsection
@section('content')
<div class="col-md-9">
<div class="col-md-12">
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">

View File

@ -3,7 +3,7 @@
@section('title', '403: Forbidden')
@section('content')
<div class="col-md-9">
<div class="col-md-12">
<div class="panel panel-danger">
<div class="panel-heading">
<h3 class="panel-title">HTTP 403: Access Denied</h3>

View File

@ -3,7 +3,7 @@
@section('title', '503: Server Temporarily Unavaliable')
@section('content')
<div class="col-md-9">
<div class="col-md-12">
<div class="panel panel-danger">
<div class="panel-heading">
<h3 class="panel-title">HTTP 503: Temporarily Unavaliable</h3>

View File

@ -77,14 +77,41 @@
</div>
<div class="list-group">
<a href="#" class="list-group-item list-group-item-heading"><strong>Node Management</strong></a>
<a href="/admin/node" class="list-group-item">List Nodes</a>
<a href="/admin/node/new" class="list-group-item">Add Node</a>
<a href="/admin/node/locations" class="list-group-item">Manage Locations</a>
<a href="/admin/node/plugins" class="list-group-item">Manage Plugins</a>
<a href="/admin/nodes" class="list-group-item">List Nodes</a>
<a href="/admin/nodes/new" class="list-group-item">Add Node</a>
<a href="/admin/locations" class="list-group-item">Manage Locations</a>
<a href="/admin/services" class="list-group-item">Manage Services</a>
</div>
@show
</div>
@yield('content')
<div class="col-md-9">
<div class="row">
<div class="col-md-12" id="tpl_messages">
@if (count($errors) > 0)
<div class="alert alert-danger">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{{ $message }}
</div>
@endforeach
@endforeach
</div>
</div>
<div class="row">
@yield('content')
</div>
</div>
</div>
<div class="footer">
<div class="row">
@ -100,6 +127,15 @@
// Remeber Active Tab and Navigate to it on Reload
for(var queryParameters={},queryString=location.search.substring(1),re=/([^&=]+)=([^&]*)/g,m;m=re.exec(queryString);)queryParameters[decodeURIComponent(m[1])]=decodeURIComponent(m[2]);$("a[data-toggle='tab']").click(function(){queryParameters.tab=$(this).attr("href").substring(1),window.history.pushState(null,null,location.pathname+"?"+$.param(queryParameters))});
if($.urlParam('tab') != null){$('.nav.nav-tabs a[href="#' + $.urlParam('tab') + '"]').tab('show');}
@if (count($errors) > 0)
@foreach ($errors->all() as $error)
<?php preg_match('/^The\s(.*?)\s/', $error, $matches) ?>
@if (isset($matches[1]))
$('[name="{{ $matches[1] }}"]').parent().parent().addClass('has-error');
@endif
@endforeach
@endif
});
</script>
</body>

View File

@ -203,7 +203,34 @@
@show
@show
</div>
@yield('content')
<div class="col-md-9">
<div class="row">
<div class="col-md-12" id="tpl_messages">
@if (count($errors) > 0)
<div class="alert alert-danger">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{{ $message }}
</div>
@endforeach
@endforeach
</div>
</div>
<div class="row">
@yield('content')
</div>
</div>
</div>
<div class="footer">
<div class="row">
@ -219,6 +246,14 @@
// Remeber Active Tab and Navigate to it on Reload
for(var queryParameters={},queryString=location.search.substring(1),re=/([^&=]+)=([^&]*)/g,m;m=re.exec(queryString);)queryParameters[decodeURIComponent(m[1])]=decodeURIComponent(m[2]);$("a[data-toggle='tab']").click(function(){queryParameters.tab=$(this).attr("href").substring(1),window.history.pushState(null,null,location.pathname+"?"+$.param(queryParameters))});
if($.urlParam('tab') != null){$('.nav.nav-tabs a[href="#' + $.urlParam('tab') + '"]').tab('show');}
@if (count($errors) > 0)
@foreach ($errors->all() as $error)
<?php preg_match('/^The\s(.*?)\s/', $error, $matches) ?>
@if (isset($matches[1]))
$('[name="{{ $matches[1] }}"]').parent().parent().addClass('has-error');
@endif
@endforeach
@endif
});
</script>
</body>

View File

@ -10,15 +10,7 @@
@endsection
@section('content')
<div class="col-md-9">
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{{ $message }}
</div>
@endforeach
@endforeach
<div class="col-md-12">
<ul class="nav nav-tabs" id="config_tabs">
<li class="active"><a href="#create" data-toggle="tab">Create File</a></li>
@can('upload-files', $server)<li><a href="#upload" data-toggle="tab">Upload Files</a></li>@endcan

View File

@ -5,16 +5,7 @@
@endsection
@section('content')
<div class="col-md-9">
<span id="save_status" style="display:none;width: 100%;"></span>
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{{ $message }}
</div>
@endforeach
@endforeach
<div class="col-md-12">
<h3 class="nopad"><small>Editing File: /home/container/{{ $file }}</small></h3>
<form method="post" id="editing_file">
<div class="form-group">
@ -85,9 +76,9 @@ $(document).ready(function () {
contents: fileContents
}
}).done(function (data) {
$('#save_status').html('<div class="alert alert-success">{{ trans('server.files.saved') }}</div>').slideDown();
$('#tpl_messages').html('<div class="alert alert-success">{{ trans('server.files.saved') }}</div>');
}).fail(function (jqXHR) {
$('#save_status').html('<div class="alert alert-danger">' + jqXHR.responseText + '</div>').slideDown();
$('#tpl_messages').html('<div class="alert alert-danger">' + jqXHR.responseText + '</div>');
}).always(function () {
$('#save_file').html('{{ trans('strings.save') }}').removeClass('disabled');
});

View File

@ -5,7 +5,7 @@
@endsection
@section('content')
<div class="col-md-9">
<div class="col-md-12">
<div class="row">
<div class="col-md-12" id="internal_alert">
<div class="alert alert-info">
@ -15,14 +15,6 @@
</div>
<div class="row">
<div class="col-md-12">
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{{ $message }}
</div>
@endforeach
@endforeach
<div class="ajax_loading_box"><i class="fa fa-refresh fa-spin" id="position_me"></i></div>
</div>
</div>

View File

@ -11,15 +11,7 @@
@endsection
@section('content')
<div class="col-md-9">
@foreach (Alert::getMessages() as $type => $messages)
@foreach ($messages as $message)
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{{ $message }}
</div>
@endforeach
@endforeach
<div class="col-md-12">
<ul class="nav nav-tabs tabs_with_panel" id="config_tabs">
<li id="triggerConsoleView" class="active"><a href="#console" data-toggle="tab">{{ trans('server.index.control') }}</a></li>
<li><a href="#stats" data-toggle="tab">{{ trans('server.index.usage') }}</a></li>