mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Move container to page in blade tempates (#10195)
That way the page can decide container-fluid or container Remove some unused blade templates as we have our own now
This commit is contained in:
Tony Murray
GitHub
@@ -5,8 +5,9 @@
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-offset-4 col-md-4">
|
||||
<div class="col-md-6 col-md-offset-3">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title center-block">
|
||||
@@ -101,4 +102,5 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
@extends('layouts.librenmsv1')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-offset-4 col-md-4">
|
||||
<div class="col-md-6 col-md-offset-3>
|
||||
<h1>External Authentication Failed.</h1>
|
||||
<p>Please close your browser window to try again or contact your administrator.</p>
|
||||
@if($message)
|
||||
@@ -11,4 +12,5 @@
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
@extends('layouts.librenmsv1')
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-md-offset-4 col-md-4">
|
||||
@include('auth.login-form')
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-6 col-md-offset-3">
|
||||
@include('auth.login-form')
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -5,6 +5,10 @@
|
||||
@append
|
||||
|
||||
@section('content')
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div id="public-status">
|
||||
<div class="well">
|
||||
<div class="status-header">@lang('System Status')
|
||||
@@ -47,6 +51,10 @@
|
||||
@include('auth.login-form')
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@section('css')
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Dashboard</div>
|
||||
|
||||
<div class="panel-body">
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
{{ session('status') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
You are logged in!
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@@ -1,5 +0,0 @@
|
||||
@extends('layouts.librenmsv1')
|
||||
|
||||
@section('content')
|
||||
Welcome to Laravel!
|
||||
@endsection
|
||||
@@ -1,80 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="{{ app()->getLocale() }}">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<!-- CSRF Token -->
|
||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||
|
||||
<title>{{ config('app.name', 'Laravel') }}</title>
|
||||
|
||||
<!-- Styles -->
|
||||
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app">
|
||||
<nav class="navbar navbar-default navbar-static-top">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
|
||||
<!-- Collapsed Hamburger -->
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#app-navbar-collapse">
|
||||
<span class="sr-only">Toggle Navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
|
||||
<!-- Branding Image -->
|
||||
<a class="navbar-brand" href="{{ url('/') }}">
|
||||
{{ config('app.name', 'Laravel') }}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="collapse navbar-collapse" id="app-navbar-collapse">
|
||||
<!-- Left Side Of Navbar -->
|
||||
<ul class="nav navbar-nav">
|
||||
|
||||
</ul>
|
||||
|
||||
<!-- Right Side Of Navbar -->
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<!-- Authentication Links -->
|
||||
@if (Auth::guest())
|
||||
<li><a href="{{ route('login') }}">Login</a></li>
|
||||
<li><a href="{{ route('register') }}">Register</a></li>
|
||||
@else
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
|
||||
{{ Auth::user()->name }} <span class="caret"></span>
|
||||
</a>
|
||||
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li>
|
||||
<a href="{{ route('logout') }}"
|
||||
onclick="event.preventDefault();
|
||||
document.getElementById('logout-form').submit();">
|
||||
Logout
|
||||
</a>
|
||||
|
||||
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
|
||||
{{ csrf_field() }}
|
||||
</form>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
@endif
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
@yield('content')
|
||||
</div>
|
||||
|
||||
<!-- Scripts -->
|
||||
<script src="{{ asset('js/app.js') }}"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -104,15 +104,9 @@
|
||||
@endif
|
||||
|
||||
<br />
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
@yield('content')
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{!! Toastr::render() !!}
|
||||
|
||||
|
||||
@@ -3,6 +3,10 @@
|
||||
@section('title', __('Locations'))
|
||||
|
||||
@section('content')
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<script id="location-graph-template" type="text/x-handlebars-template">
|
||||
<tr class="bg-fixer-@{{id}}"></tr>
|
||||
<tr id="location-graph-@{{id}}" class="location_graphs">
|
||||
@@ -54,6 +58,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@section('css')
|
||||
|
||||
@@ -3,26 +3,29 @@
|
||||
@section('title', __('Create User'))
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<form action="users" method="POST" role="form" class="form-horizontal col-sm-offset-3 col-sm-6">
|
||||
<legend>@lang('Create User')</legend>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<form action="users" method="POST" role="form" class="form-horizontal col-md-8 col-md-offset-2">
|
||||
<legend>@lang('Create User')</legend>
|
||||
|
||||
<div class="form-group @if($errors->has('username')) has-error @endif">
|
||||
<label for="realname" class="control-label col-sm-3">@lang('Username')</label>
|
||||
<div class="col-sm-9">
|
||||
<input type="text" class="form-control" id="username" name="username" value="{{ old('username', $user->username) }}">
|
||||
<span class="help-block">{{ $errors->first('username') }}</span>
|
||||
<div class="form-group @if($errors->has('username')) has-error @endif">
|
||||
<label for="realname" class="control-label col-sm-3">@lang('Username')</label>
|
||||
<div class="col-sm-9">
|
||||
<input type="text" class="form-control" id="username" name="username"
|
||||
value="{{ old('username', $user->username) }}">
|
||||
<span class="help-block">{{ $errors->first('username') }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@include('user.form')
|
||||
@include('user.form')
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-sm-9 col-sm-offset-3">
|
||||
<button type="submit" class="btn btn-primary">@lang('Save')</button>
|
||||
<a type="button" class="btn btn-danger" href="{{ route('users.index') }}">@lang('Cancel')</a>
|
||||
<div class="form-group">
|
||||
<div class="col-sm-9 col-sm-offset-3">
|
||||
<button type="submit" class="btn btn-primary">@lang('Save')</button>
|
||||
<a type="button" class="btn btn-danger" href="{{ route('users.index') }}">@lang('Cancel')</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -3,45 +3,47 @@
|
||||
@section('title', __('Edit User'))
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<form action="users/{{ $user->user_id }}" method="POST" role="form" class="form-horizontal col-sm-offset-3 col-sm-6">
|
||||
<legend>@lang('Edit User'): {{ $user->username }}</legend>
|
||||
{{ method_field('PUT') }}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<form action="users/{{ $user->user_id }}" method="POST" role="form" class="form-horizontal col-md-8 col-md-offset-2">
|
||||
<legend>@lang('Edit User'): {{ $user->username }}</legend>
|
||||
{{ method_field('PUT') }}
|
||||
|
||||
@include('user.form')
|
||||
@include('user.form')
|
||||
|
||||
@config('twofactor')
|
||||
<br/>
|
||||
<div class="panel panel-default col-sm-offset-3">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Two-Factor Authentication</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
|
||||
@if($twofactor_enabled)
|
||||
@if($twofactor_locked)
|
||||
<div class="form-group" id="twofactor-unlock-form">
|
||||
<button type="button" id="twofactor-unlock" class="btn btn-default col-sm-4 col-sm-offset-1">@lang('Unlock')</button>
|
||||
<label for="twofactor-unlock" class="col-sm-7 control-label">@lang('User exceeded failures')</label>
|
||||
</div>
|
||||
@endif
|
||||
<div class="form-group">
|
||||
<button type="button" id="twofactor-disable" class="btn btn-danger col-sm-offset-1">@lang('Disable TwoFactor')</button>
|
||||
@config('twofactor')
|
||||
<br/>
|
||||
<div class="panel panel-default col-sm-offset-3">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Two-Factor Authentication</h3>
|
||||
</div>
|
||||
@else
|
||||
<p>@lang('No TwoFactor key generated for this user, Nothing to do.')</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@endconfig
|
||||
<div class="panel-body">
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-sm-9 col-sm-offset-3">
|
||||
<button type="submit" class="btn btn-primary">@lang('Save')</button>
|
||||
<a type="button" class="btn btn-danger" href="{{ route('users.index') }}">@lang('Cancel')</a>
|
||||
@if($twofactor_enabled)
|
||||
@if($twofactor_locked)
|
||||
<div class="form-group" id="twofactor-unlock-form">
|
||||
<button type="button" id="twofactor-unlock" class="btn btn-default col-sm-4 col-sm-offset-1">@lang('Unlock')</button>
|
||||
<label for="twofactor-unlock" class="col-sm-7 control-label">@lang('User exceeded failures')</label>
|
||||
</div>
|
||||
@endif
|
||||
<div class="form-group">
|
||||
<button type="button" id="twofactor-disable" class="btn btn-danger col-sm-offset-1">@lang('Disable TwoFactor')</button>
|
||||
</div>
|
||||
@else
|
||||
<p>@lang('No TwoFactor key generated for this user, Nothing to do.')</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@endconfig
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-sm-9 col-sm-offset-3">
|
||||
<button type="submit" class="btn btn-primary">@lang('Save')</button>
|
||||
<a type="button" class="btn btn-danger" href="{{ route('users.index') }}">@lang('Cancel')</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
|
||||
@@ -3,39 +3,40 @@
|
||||
@section('title', __('Manage Users'))
|
||||
|
||||
@section('content')
|
||||
|
||||
<div id="manage-users-panel" class="panel panel-default">
|
||||
<div class="panel-heading"><h4 class="panel-title"><i class="fa fa-user-circle-o fa-fw fa-lg" aria-hidden="true"></i> @lang('Manage Users')</h4></div>
|
||||
<div class="panel-body">
|
||||
<div class="table-responsive">
|
||||
<table id="users" class="table table-bordered table-condensed" style="display: none;">
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-column-id="user_id" data-visible="false" data-identifier="true" data-type="numeric">@lang('ID')</th>
|
||||
<th data-column-id="username">@lang('Username')</th>
|
||||
<th data-column-id="realname">@lang('Real Name')</th>
|
||||
<th data-column-id="level" data-formatter="level" data-type="numeric">@lang('Access')</th>
|
||||
<th data-column-id="auth_type" data-visible="{{ $multiauth ? 'true' : 'false' }}">@lang('Auth')</th>
|
||||
<th data-column-id="email">@lang('Email')</th>
|
||||
<th data-column-id="descr">@lang('Description')</th>
|
||||
<th data-column-id="action" data-formatter="actions" data-sortable="false" data-searchable="false">@lang('Actions')</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="users_rows">
|
||||
@foreach($users as $user)
|
||||
<tr>
|
||||
<td>{{ $user->user_id }}</td>
|
||||
<td>{{ $user->username }}</td>
|
||||
<td>{{ $user->realname }}</td>
|
||||
<td>{{ $user->level }}</td>
|
||||
<td>{{ $user->auth_type }}</td>
|
||||
<td>{{ $user->email }}</td>
|
||||
<td>{{ $user->descr }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="container-fluid">
|
||||
<div id="manage-users-panel" class="panel panel-default">
|
||||
<div class="panel-heading"><h4 class="panel-title"><i class="fa fa-user-circle-o fa-fw fa-lg" aria-hidden="true"></i> @lang('Manage Users')</h4></div>
|
||||
<div class="panel-body">
|
||||
<div class="table-responsive">
|
||||
<table id="users" class="table table-bordered table-condensed" style="display: none;">
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-column-id="user_id" data-visible="false" data-identifier="true" data-type="numeric">@lang('ID')</th>
|
||||
<th data-column-id="username">@lang('Username')</th>
|
||||
<th data-column-id="realname">@lang('Real Name')</th>
|
||||
<th data-column-id="level" data-formatter="level" data-type="numeric">@lang('Access')</th>
|
||||
<th data-column-id="auth_type" data-visible="{{ $multiauth ? 'true' : 'false' }}">@lang('Auth')</th>
|
||||
<th data-column-id="email">@lang('Email')</th>
|
||||
<th data-column-id="descr">@lang('Description')</th>
|
||||
<th data-column-id="action" data-formatter="actions" data-sortable="false" data-searchable="false">@lang('Actions')</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="users_rows">
|
||||
@foreach($users as $user)
|
||||
<tr>
|
||||
<td>{{ $user->user_id }}</td>
|
||||
<td>{{ $user->username }}</td>
|
||||
<td>{{ $user->realname }}</td>
|
||||
<td>{{ $user->level }}</td>
|
||||
<td>{{ $user->auth_type }}</td>
|
||||
<td>{{ $user->email }}</td>
|
||||
<td>{{ $user->descr }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,99 +0,0 @@
|
||||
<!doctype html>
|
||||
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<title>Laravel</title>
|
||||
|
||||
<!-- Fonts -->
|
||||
<link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">
|
||||
|
||||
<!-- Styles -->
|
||||
<style>
|
||||
html, body {
|
||||
background-color: #fff;
|
||||
color: #636b6f;
|
||||
font-family: 'Nunito', sans-serif;
|
||||
font-weight: 200;
|
||||
height: 100vh;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.full-height {
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
.flex-center {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.position-ref {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.top-right {
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
top: 18px;
|
||||
}
|
||||
|
||||
.content {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 84px;
|
||||
}
|
||||
|
||||
.links > a {
|
||||
color: #636b6f;
|
||||
padding: 0 25px;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
letter-spacing: .1rem;
|
||||
text-decoration: none;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.m-b-md {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="flex-center position-ref full-height">
|
||||
@if (Route::has('login'))
|
||||
<div class="top-right links">
|
||||
@auth
|
||||
<a href="{{ url('/home') }}">Home</a>
|
||||
@else
|
||||
<a href="{{ route('login') }}">Login</a>
|
||||
|
||||
@if (Route::has('register'))
|
||||
<a href="{{ route('register') }}">Register</a>
|
||||
@endif
|
||||
@endauth
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="content">
|
||||
<div class="title m-b-md">
|
||||
Laravel
|
||||
</div>
|
||||
|
||||
<div class="links">
|
||||
<a href="https://laravel.com/docs">Docs</a>
|
||||
<a href="https://laracasts.com">Laracasts</a>
|
||||
<a href="https://laravel-news.com">News</a>
|
||||
<a href="https://blog.laravel.com">Blog</a>
|
||||
<a href="https://nova.laravel.com">Nova</a>
|
||||
<a href="https://forge.laravel.com">Forge</a>
|
||||
<a href="https://github.com/laravel/laravel">GitHub</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user