diff options
Diffstat (limited to 'resources/views')
| -rw-r--r-- | resources/views/inc/navbar.blade.php | 10 | ||||
| -rw-r--r-- | resources/views/inc/special_navbar.blade.php | 31 | ||||
| -rw-r--r-- | resources/views/layouts/app.blade.php | 2 | ||||
| -rw-r--r-- | resources/views/pages/activities.blade.php | 2 | ||||
| -rw-r--r-- | resources/views/pages/callsigns.blade.php | 2 | ||||
| -rw-r--r-- | resources/views/pages/reservations.blade.php | 2 | ||||
| -rw-r--r-- | resources/views/pages/reserve.blade.php | 2 |
7 files changed, 44 insertions, 7 deletions
diff --git a/resources/views/inc/navbar.blade.php b/resources/views/inc/navbar.blade.php index c324674..485dc9c 100644 --- a/resources/views/inc/navbar.blade.php +++ b/resources/views/inc/navbar.blade.php @@ -1,6 +1,6 @@ <nav class="navbar navbar-expand-md navbar-dark bg-dark"> <div class="container"> - <span class="navbar-brand">YOTA</span> + <a href="{{ route('home') }}" class="navbar-brand">YOTA</a> <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbarCollapse"> <span class="navbar-toggler-icon"></span> </button> @@ -11,8 +11,7 @@ <a href="{{ route('news') }}" class="nav-item nav-link {{ request()->routeIs('news') ? 'active' : '' }}">News</a> <a href="{{ route('gallery') }}" class="nav-item nav-link {{ request()->routeIs('gallery') ? 'active' : '' }}">Gallery</a> <a href="{{ route('sponsoring') }}" class="nav-item nav-link {{ request()->routeIs('sponsoring') ? 'active' : '' }}">Sponsoring</a> - <a href="{{ route('activities') }}" class="nav-item nav-link {{ request()->routeIs('activities') ? 'active' : '' }}">Activities</a> - <a href="{{ route('reserve') }}" class="nav-item nav-link {{ request()->routeIs('reserve') ? 'active' : '' }}">Make reservation</a> + <a href="{{ route('activities') }}" class="nav-item nav-link {{ request()->routeIs('activities') ? 'active' : '' }}">Special Calls</a> </div> <div class="navbar-nav ml-auto"> @if (Auth::check()) @@ -21,9 +20,8 @@ Administration </a> <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> - <a class="dropdown-item" href="#">Posts</a> - <a class="dropdown-item" href="#">Callsigns</a> - <a class="dropdown-item" href="#">Reservations</a> + <a class="dropdown-item" href="#">News</a> + <a class="dropdown-item" href="#">Gallery</a> </div> </div> <a href="{{ route('logout') }}" class="nav-item nav-link">Logout</a> diff --git a/resources/views/inc/special_navbar.blade.php b/resources/views/inc/special_navbar.blade.php new file mode 100644 index 0000000..de551ba --- /dev/null +++ b/resources/views/inc/special_navbar.blade.php @@ -0,0 +1,31 @@ +<nav class="navbar navbar-expand-md navbar-dark bg-dark"> + <div class="container"> + <a href="{{ route('home') }}" class="navbar-brand">YOTA</a> + <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbarCollapse"> + <span class="navbar-toggler-icon"></span> + </button> + + <div class="collapse navbar-collapse" id="navbarCollapse"> + <div class="navbar-nav"> + <a href="{{ route('activities') }}" class="nav-item nav-link {{ request()->routeIs('activities') ? 'active' : '' }}">Activities</a> + <a href="{{ route('reserve') }}" class="nav-item nav-link {{ request()->routeIs('reserve') ? 'active' : '' }}">Make reservation</a> + </div> + <div class="navbar-nav ml-auto"> + @if (Auth::check()) + <div class="nav-item dropdown"> + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + Administration + </a> + <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> + <a class="dropdown-item" href="#">Callsigns</a> + <a class="dropdown-item" href="#">Reservations</a> + </div> + </div> + <a href="{{ route('logout') }}" class="nav-item nav-link">Logout</a> + @else + <a href="{{ route('login') }}" class="nav-item nav-link {{ request()->routeIs('login') ? 'active' : '' }}">Login</a> + @endif + </div> + </div> + </div> +</nav> diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 07b8d8a..a85d43a 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -11,7 +11,7 @@ <title>YOTA - @yield('title')</title> </head> <body> - @include('inc.navbar') + @yield('navbar', View::make('inc.navbar')) @yield('jumbotron') <div class="container pt-3"> @yield('content') diff --git a/resources/views/pages/activities.blade.php b/resources/views/pages/activities.blade.php index ac2b04d..e15266f 100644 --- a/resources/views/pages/activities.blade.php +++ b/resources/views/pages/activities.blade.php @@ -2,6 +2,8 @@ @section('title', 'Special Calls - Activities') +@section('navbar', View::make('inc.special_navbar')) + @section('content') @if (1==2) <div class="table-responsive"> diff --git a/resources/views/pages/callsigns.blade.php b/resources/views/pages/callsigns.blade.php index 10cea68..7866a1f 100644 --- a/resources/views/pages/callsigns.blade.php +++ b/resources/views/pages/callsigns.blade.php @@ -2,6 +2,8 @@ @section('title', 'Callsigns administration') +@section('navbar', View::make('inc.special_navbar')) + @section('content') <strong>CALLSIGNS ADMINISTRATION</strong> @endsection diff --git a/resources/views/pages/reservations.blade.php b/resources/views/pages/reservations.blade.php index a444f55..56c379d 100644 --- a/resources/views/pages/reservations.blade.php +++ b/resources/views/pages/reservations.blade.php @@ -2,6 +2,8 @@ @section('title', 'Reservations') +@section('navbar', View::make('inc.special_navbar')) + @section('content') <div class="table-responsive"> <table class="table table-striped table-bordered"><!-- table-hover --> diff --git a/resources/views/pages/reserve.blade.php b/resources/views/pages/reserve.blade.php index f0d6fe8..fad6edc 100644 --- a/resources/views/pages/reserve.blade.php +++ b/resources/views/pages/reserve.blade.php @@ -2,6 +2,8 @@ @section('title', 'Make reservation') +@section('navbar', View::make('inc.special_navbar')) + @section('content') @if (session('status')) <div class="alert alert-success"> |