Redesign + Fixes
This commit is contained in:
parent
7718ed6c32
commit
7fe8056e35
67 changed files with 1898 additions and 2799 deletions
|
|
@ -36,8 +36,8 @@
|
|||
<div class="wrapper">
|
||||
<header class="main-header">
|
||||
<a class="logo">
|
||||
<span class="logo-mini"><b>TP</b></span>
|
||||
<span class="logo-lg"><b>ThemePark</b></span>
|
||||
<span class="logo-mini"><b>{{ env('APP_NAME_SHORT', 'TP') }}</b></span>
|
||||
<span class="logo-lg"><b>{{ env('APP_NAME', 'ThemePark') }}</b></span>
|
||||
</a>
|
||||
|
||||
<nav class="navbar navbar-static-top">
|
||||
|
|
@ -95,16 +95,30 @@
|
|||
<li @if(Request::is('panel/home*')) class="active" @endif><a href="{{ route('panel.home') }}"><i class="fas fa-tachometer-alt"></i> <span>Dashboard</span></a></li>
|
||||
<li @if(Request::is('panel/message*')) class="active" @endif><a href="{{ route('panel.message') }}"><i class="fas fa-feather-alt"></i> <span>Message</span></a></li>
|
||||
<li @if(Request::is('panel/ums*')) class="active" @endif><a href="{{ route('panel.ums') }}"><i class="fas fa-users"></i> User Manager</a></li>
|
||||
<li class="treeview @if(Request::is('panel/show*')) menu-open active @endif">
|
||||
@if(env('SHOWS', false))
|
||||
<li class="treeview @if(Request::is('panel/show*')) menu-open active @endif">
|
||||
<a>
|
||||
<i class="fas fa-theater-masks"></i> <span>Shows</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu" style="display: @if(Request::is('panel/show*')) block @else none @endif">
|
||||
<li @if(Request::is('panel/show') || Request::is('panel/show/*')) class="active" @endif><a href="{{ route('panel.show') }}"><i class="fas fa-feather-alt"></i> Manager</a></li>
|
||||
<li @if(Request::is('panel/shows*')) class="active" @endif><a href="{{ route('panel.shows') }}"><i class="fas fa-calendar-alt"></i> Dates</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
@endif
|
||||
<li class="treeview @if(Request::is('panel/tools*')) menu-open active @endif">
|
||||
<a>
|
||||
<i class="fas fa-theater-masks"></i> <span>Shows</span>
|
||||
<i class="fas fa-wrench"></i> <span>Tools</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu" style="display: @if(Request::is('panel/show*')) block @else none @endif">
|
||||
<li @if(Request::is('panel/show') || Request::is('panel/show/*')) class="active" @endif><a href="{{ route('panel.show') }}"><i class="fas fa-feather-alt"></i> Manager</a></li>
|
||||
<li @if(Request::is('panel/shows*')) class="active" @endif><a href="{{ route('panel.shows') }}"><i class="fas fa-calendar-alt"></i> Dates</a></li>
|
||||
<ul class="treeview-menu" style="display: @if(Request::is('panel/tools*')) block @else none @endif">
|
||||
<li @if(Request::is('panel/tools/operator*')) class="active" @endif><a href="{{ route('panel.operator') }}"><i class="fas fa-user-cog"></i> Operator</a></li>
|
||||
<li @if(Request::is('panel/tools/css*')) class="active" @endif><a href="{{ route('panel.css') }}"><i class="fas fa-palette"></i> CSS</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
@ -129,7 +143,7 @@
|
|||
<div class="pull-right hidden-xs">
|
||||
<b>Version</b> {{ env('APP_VERSION', '1.0') }}
|
||||
</div>
|
||||
<span>Copyright © 2019-{{ date('Y') }} <a href="https://www.iobyte.nl/"><img src="{{ asset('assets/img/logo-lg.png') }}" alt="IOByte"></a>. All rights reserved.</span>
|
||||
<span>Copyright © 2019-{{ date('Y') }} <a href="https://www.iobyte.nl/"><img src="{{ asset('assets/img/logo.png') }}" alt="IOByte"></a>. All rights reserved.</span>
|
||||
</footer>
|
||||
|
||||
<div class="control-sidebar-bg"></div>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<meta charset="UTF-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>ThemePark</title>
|
||||
<title>{{ env('APP_NAME', 'ThemePark') }}</title>
|
||||
|
||||
<!-- ==============================================
|
||||
Favicon
|
||||
|
|
@ -24,30 +24,11 @@
|
|||
</head>
|
||||
<body>
|
||||
|
||||
|
||||
<nav class="navbar navbar-theme navbar-fixed-top">
|
||||
<div class="container-fluid">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapses" aria-expanded="false">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand">ThemePark</a>
|
||||
</div>
|
||||
|
||||
<div class="collapse navbar-collapse" id="navbar-collapses">
|
||||
@yield('navigation')
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
@yield('content')
|
||||
@yield('body')
|
||||
|
||||
<footer class="footer">
|
||||
<div class="container">
|
||||
<span>Copyright © 2019-{{ date('Y') }} <a href="https://www.iobyte.nl/"><img src="{{ asset('assets/img/logo-lg.png') }}" alt="IOByte"></a>. All rights reserved.</span>
|
||||
<span>Copyright © 2019-{{ date('Y') }} <a href="https://www.iobyte.nl/"><img src="{{ asset('assets/img/logo.png') }}" alt="IOByte"></a>. All rights reserved.</span>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
|
|
@ -1,27 +1,32 @@
|
|||
@extends('layouts.panel')
|
||||
@extends('layouts.default')
|
||||
|
||||
@section('navigation')
|
||||
<ul class="nav navbar-nav">
|
||||
<li @if(Request::is('/') || Request::is('home*')) class="active" @endif><a href="{{ route('home') }}">Home</a></li>
|
||||
<li @if(Request::is('status*') || Request::is('ridecount*')) class="active" @endif><a href="{{ route('status') }}">Attraction Status</a></li>
|
||||
@if(Route::has('photo'))
|
||||
<li @if(Request::is('photo*')) class="active" @endif><a href="{{ route('photo') }}">ActionFoto's</a></li>
|
||||
@endif
|
||||
<li @if(Request::is('shows*') || Request::is('order*')) class="active" @endif><a href="{{ route('shows') }}">Show</a></li>
|
||||
<li><a href="{{ route('store') }}">Store</a></li>
|
||||
@if(Route::has('openaudiomc'))
|
||||
<li @if(Request::is('openaudiomc*')) class="active" @endif><a href="{{ route('openaudiomc') }}">OpenAudioMC</a></li>
|
||||
@section('body')
|
||||
@component('components.navbar')
|
||||
@if(env('HOME_PAGE', false))
|
||||
<li @if(Request::is('/') || Request::is('home*')) class="active" @endif><a href="{{ route('home') }}">Home</a></li>
|
||||
@endif
|
||||
<li @if(Request::is('status*') || Request::is('ridecount*')) class="active" @endif><a href="{{ route('status') }}">Attraction Status</a></li>
|
||||
@if(Route::has('photo'))
|
||||
<li @if(Request::is('photo*')) class="active" @endif><a href="{{ route('photo') }}">ActionFoto's</a></li>
|
||||
@endif
|
||||
<li @if(Request::is('shows*') || Request::is('order*')) class="active" @endif><a href="{{ route('shows') }}">Show</a></li>
|
||||
@if(Route::has('store'))
|
||||
<li><a href="{{ route('store') }}">Store</a></li>
|
||||
@endif
|
||||
@if(Route::has('openaudiomc'))
|
||||
<li @if(Request::is('openaudiomc*')) class="active" @endif><a href="{{ route('openaudiomc') }}">OpenAudioMC</a></li>
|
||||
@endif
|
||||
|
||||
<li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ Auth::user()->username() }}<span class="caret"></span></a><ul class="dropdown-menu">
|
||||
<li><a href="{{ route('profile.home') }}">Profile</a></li>
|
||||
@if(Auth::user()->is_admin || Auth::user()->is_root)
|
||||
<li><a href="{{ route('panel.home') }}">Admin</a></li>
|
||||
<li role="separator" class="divider"></li>
|
||||
@endif
|
||||
<li><a href="{{ route('logout') }}">Logout</a></li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ Auth::user()->username() }}<span class="caret"></span></a><ul class="dropdown-menu">
|
||||
<li><a href="{{ route('profile.home') }}">Profile</a></li>
|
||||
@if(Auth::user()->is_admin || Auth::user()->is_root)
|
||||
<li><a href="{{ route('panel.home') }}">Admin</a></li>
|
||||
<li role="separator" class="divider"></li>
|
||||
@endif
|
||||
<li><a href="{{ route('logout') }}">Logout</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
@endcomponent
|
||||
|
||||
@yield('content')
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
@extends('layouts.panel')
|
||||
@extends('layouts.default')
|
||||
|
||||
@section('navigation')
|
||||
<ul class="nav navbar-nav">
|
||||
@section('body')
|
||||
@component('components.navbar')
|
||||
<li @if(Request::is('profile/home*')) class="active" @endif><a href="{{ route('profile.home') }}">Home</a></li>
|
||||
<li @if(Request::is('profile/security*')) class="active" @endif><a href="{{ route('security') }}">Security</a></li>
|
||||
<li @if(Request::is('profile/change*')) class="active" @endif><a href="{{ route('change') }}">Change</a></li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ Auth::user()->username() }}<span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
|
|
@ -18,5 +16,7 @@
|
|||
<li><a href="{{ route('logout') }}">Logout</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
@endcomponent
|
||||
|
||||
@yield('content')
|
||||
@endsection
|
||||
|
|
|
|||
Reference in a new issue