From 7499a7f90a9687e958b07ab240652e4459db52cc Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 9 Aug 2022 17:12:47 +0200
Subject: [PATCH] navigation component add option to pass css classes for left
 menu, verticalsplit add isCollapsed function, searchbar remove search button
 and prevent page reload on pressing enter

---
 public/js/components/navigation/Navigation.js       | 8 ++++++--
 public/js/components/searchbar/searchbar.js         | 5 ++---
 public/js/components/verticalsplit/verticalsplit.js | 9 +++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/public/js/components/navigation/Navigation.js b/public/js/components/navigation/Navigation.js
index 214377d21..e6d53d080 100644
--- a/public/js/components/navigation/Navigation.js
+++ b/public/js/components/navigation/Navigation.js
@@ -29,7 +29,11 @@ export const CoreNavigationCmpt = {
 	props: {
 		addHeaderMenuEntries: Object, // property used to add new header menu entries from another app/component
 		addSideMenuEntries: Object, // property used to add new side menu entries from another app/component
-		hideTopMenu: Boolean
+		hideTopMenu: Boolean,
+                leftNavCssClasses: {
+                    type: String,
+                    default: 'navbar navbar-left-side'
+                }
 	},
 	data: function() {
 		return {
@@ -131,7 +135,7 @@ export const CoreNavigationCmpt = {
 		</nav>
 
 		<!-- Left side menu -->
-		<nav class="navbar navbar-left-side">
+		<nav :class="leftNavCssClasses">
 			<ul class="navbar-nav">
 				<!-- 1st level -->
 				<template v-for="menu in sideMenuEntries">
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 2a3f11982..7c0993e8a 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -27,15 +27,14 @@ export default {
       organisationunit: organisationunit
     },
     template: `
-          <form ref="searchform" class="d-flex me-3"
+          <form ref="searchform" class="d-flex me-3" action="javascript:void(0);" 
             @focusin="this.searchfocusin" @focusout="this.searchfocusout">
             <div class="input-group me-2 bg-white">
                 <input ref="searchbox" @keyup="this.search" @focus="this.showsearchresult" 
                     v-model="this.searchsettings.searchstr" class="form-control" 
                     type="search" placeholder="Search" aria-label="Search">
                 <button ref="settingsbutton" @click="this.togglesettings" class="btn btn-outline-secondary" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
-            </div>
-            <button @click="this.search" class="btn btn-outline-success" type="button">Search</button>
+            </div>            
         
             <div v-show="this.showresult" ref="result" 
                  class="searchbar_results" tabindex="-1">
diff --git a/public/js/components/verticalsplit/verticalsplit.js b/public/js/components/verticalsplit/verticalsplit.js
index 1a37a786e..b89bea5c4 100644
--- a/public/js/components/verticalsplit/verticalsplit.js
+++ b/public/js/components/verticalsplit/verticalsplit.js
@@ -76,6 +76,15 @@ export default {
             this.topheight = Math.floor(this.availHeight/2);
             this.bottomheight = Math.floor(this.availHeight/2);
         },
+        isCollapsed: function() {
+            if( this.topheight === 0 ) {
+                return 'top';
+            } else if ( this.bottomheight === 0 ) {
+                return 'bottom';
+            } else {
+                return false;
+            }
+        },
         dragStart: function(e) {
             e.preventDefault();
             e.stopPropagation();