aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateja <mail@matejamaric.com>2020-11-15 22:00:11 +0100
committerMateja <mail@matejamaric.com>2020-11-15 22:00:11 +0100
commit5c8e187d09c19c920eab955ae68c1eed5b17747f (patch)
tree542f08ccd6bd13a2c91b7ccdfbbd3ba0aa748679
parenta197dec136feae5cbf770f412cb951a62ed62564 (diff)
downloadyota-laravel-5c8e187d09c19c920eab955ae68c1eed5b17747f.tar.gz
yota-laravel-5c8e187d09c19c920eab955ae68c1eed5b17747f.zip
Special Calls on main website. Important!
-rw-r--r--resources/views/inc/navbar.blade.php16
-rw-r--r--resources/views/pages/activities.blade.php2
-rw-r--r--resources/views/pages/callsigns.blade.php2
-rw-r--r--resources/views/pages/editsign.blade.php2
-rw-r--r--resources/views/pages/reservations.blade.php2
-rw-r--r--resources/views/pages/reserve.blade.php2
6 files changed, 18 insertions, 8 deletions
diff --git a/resources/views/inc/navbar.blade.php b/resources/views/inc/navbar.blade.php
index 332c799..49fe2fd 100644
--- a/resources/views/inc/navbar.blade.php
+++ b/resources/views/inc/navbar.blade.php
@@ -11,7 +11,15 @@
<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' : '' }}">Special Calls</a>
+ <div class="nav-item dropdown">
+ <span class="nav-link dropdown-toggle" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ Special Calls
+ </span>
+ <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+ <a href="{{ route('activities') }}" class="dropdown-item {{ request()->routeIs('activities') ? 'active' : '' }}">Activities</a>
+ <a href="{{ route('reserve') }}" class="dropdown-item {{ request()->routeIs('reserve') ? 'active' : '' }}">Make reservation</a>
+ </div>
+ </div>
</div>
<div class="navbar-nav ml-auto">
@if (Auth::check())
@@ -20,8 +28,10 @@
Administration
</span>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
- <a class="dropdown-item" href="{{ route('newsAdd') }}">News</a>
- <a class="dropdown-item" href="{{ route('galleryAdd') }}">Gallery</a>
+ <a class="dropdown-item {{ request()->routeIs('newsAdd') ? 'active' : '' }}" href="{{ route('newsAdd') }}">News</a>
+ <a class="dropdown-item {{ request()->routeIs('galleryAdd') ? 'active' : '' }}" href="{{ route('galleryAdd') }}">Gallery</a>
+ <a class="dropdown-item {{ request()->routeIs('addSign') ? 'active' : '' }}" href="{{ route('addSign') }}">Callsigns</a>
+ <a class="dropdown-item {{ request()->routeIs('reservations') ? 'active' : '' }}" href="{{ route('reservations') }}">Reservations</a>
</div>
</div>
<a href="{{ route('logout') }}" class="nav-item nav-link">Logout</a>
diff --git a/resources/views/pages/activities.blade.php b/resources/views/pages/activities.blade.php
index 897c622..631ccc6 100644
--- a/resources/views/pages/activities.blade.php
+++ b/resources/views/pages/activities.blade.php
@@ -2,7 +2,7 @@
@section('title', 'Special Calls - Activities')
-@section('navbar', View::make('inc.special_navbar'))
+@section('navbar', View::make('inc.navbar'))
@section('content')
<input type="hidden" name="csrf-token" content="{{ csrf_token() }}">
diff --git a/resources/views/pages/callsigns.blade.php b/resources/views/pages/callsigns.blade.php
index feed795..45336dc 100644
--- a/resources/views/pages/callsigns.blade.php
+++ b/resources/views/pages/callsigns.blade.php
@@ -2,7 +2,7 @@
@section('title', 'Callsigns administration')
-@section('navbar', View::make('inc.special_navbar'))
+@section('navbar', View::make('inc.navbar'))
@section('content')
<h3>Callsigns Administration:</h3>
diff --git a/resources/views/pages/editsign.blade.php b/resources/views/pages/editsign.blade.php
index 4741ba4..631b5ac 100644
--- a/resources/views/pages/editsign.blade.php
+++ b/resources/views/pages/editsign.blade.php
@@ -2,7 +2,7 @@
@section('title', 'Edit callsign')
-@section('navbar', View::make('inc.special_navbar'))
+@section('navbar', View::make('inc.navbar'))
@section('content')
<h3 class="mt-2">Edit Callsign:</h3>
diff --git a/resources/views/pages/reservations.blade.php b/resources/views/pages/reservations.blade.php
index 1a94525..66b4d7e 100644
--- a/resources/views/pages/reservations.blade.php
+++ b/resources/views/pages/reservations.blade.php
@@ -2,7 +2,7 @@
@section('title', 'Reservations')
-@section('navbar', View::make('inc.special_navbar'))
+@section('navbar', View::make('inc.navbar'))
@section('content')
@if (count($data) > 0)
diff --git a/resources/views/pages/reserve.blade.php b/resources/views/pages/reserve.blade.php
index 868ae24..0bcab42 100644
--- a/resources/views/pages/reserve.blade.php
+++ b/resources/views/pages/reserve.blade.php
@@ -2,7 +2,7 @@
@section('title', 'Make reservation')
-@section('navbar', View::make('inc.special_navbar'))
+@section('navbar', View::make('inc.navbar'))
@section('content')
@if (session('status'))