Refactored home page partials to have fewer separate files

resources/assets/sass/common.scss

@@ -118,13 +118,6 @@ h6,
 			max-height: 50px;
 		}
 	}
-	.language-selector {
-		//hide the language selection for now, as of 25 July 2023
-		display: none;
-	}
-	.language-selector .dropdown-menu {
-		left: -90px;
-	}
 }
 
 .logged-in-env .main-header {

resources/views/home/home.blade.php

@@ -2,7 +2,7 @@
 
 @section('content')
     <section id="motto" class="w-100" style="height: 650px;">
-        @include('home.partials.' . config('app.installation_resources_dir') . '.motto')
+        @include('home.partials.motto')
     </section>
     <section id="about" class="container-fluid w-100">
         @include('home.partials.' . config('app.installation_resources_dir') . '.about-us')
@@ -11,7 +11,7 @@
         @include('home.partials.' . config('app.installation_resources_dir') . '.projects')
     </section>
     <section id="features" class="container-fluid w-100">
-        @include('home.partials.' . config('app.installation_resources_dir') . '.features')
+        @include('home.partials.features')
     </section>
 
 @endsection

resources/views/home/layout.blade.php

@@ -32,7 +32,7 @@
 @include('partials.staging-indicator')
 <div class="row">
     <div class="col-12">
-        @include('home.partials.' . config('app.installation_resources_dir') . '.navbar')
+        @include('home.partials.navbar', ['logoPath' => asset('images/projects/' . config('app.installation_resources_dir') . '/logo_menu.png')])
     </div>
 </div>
 @include('partials.flash-messages-and-errors')

resources/views/home/partials/ecas/navbar.blade.php → resources/views/home/partials/navbar.blade.php

@@ -2,7 +2,7 @@
     <nav class="main-header navbar navbar-expand-lg navbar-white navbar-light fixed-top navbar-default navbar-fixed-top m-0"
          style="z-index: 100000;">
         <a class="navbar-brand" href="{{route('home', ['locale' => app()->getLocale()])}}">
-            <img loading="lazy" alt="ECAS" src="{{asset('images/projects/ecas/ecas_logo_scaled.png')}}">
+            <img loading="lazy" alt="ECAS" src="{{ $logoPath }}">
         </a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#top-menu-content"
                 aria-controls="top-menu-content" aria-expanded="false" aria-label="Toggle navigation">
@@ -25,6 +25,7 @@
                 @if(!isset($onErrorPage))
                     @include("partials.login-menu-options")
                 @endif
+                @include("partials.language-selector")
             </ul>
         </div>
     </nav>

resources/views/partials/login-menu-options.blade.php

@@ -34,7 +34,6 @@ class="btn btn-default btn-flat">{{ __("menu.sign_out")}}</a>
             </li>
         </ul>
     </li>
-
 @else
     <li class="nav-item">
         <a class="nav-link" href="{{ isset($redirectLoginURL) ? $redirectLoginURL : route("login") }}">{{ __("menu.login")}}</a>
@@ -43,4 +42,3 @@ class="btn btn-default btn-flat">{{ __("menu.sign_out")}}</a>
         <a class="nav-link" href="{{ isset($redirectRegisterURL) ? $redirectRegisterURL : route("register") }}">{{ __("menu.register")}}</a>
     </li>
 @endif
-@include('partials.language-selector')