From 3e3f0055258e15bd03a57018b61225d54532e658 Mon Sep 17 00:00:00 2001 From: SimonGschnell Date: Fri, 28 Jun 2024 14:34:41 +0200 Subject: [PATCH 1/4] changes the layout/buttons of the searchbarsettings, adds responsive searchbar in the header for mobile views --- application/views/system/logs/testSearch.php | 2 +- .../views/templates/CISHTML-Header.php | 3 +- public/css/Cis4/Cis.css | 2 +- .../components/{ => searchbar}/searchbar.css | 20 ++++++-- public/css/components/searchbar/switches.css | 23 +++++++++ public/js/components/Cis/Menu.js | 1 + public/js/components/searchbar/searchbar.js | 49 ++++++++++--------- 7 files changed, 69 insertions(+), 31 deletions(-) rename public/css/components/{ => searchbar}/searchbar.css (83%) create mode 100644 public/css/components/searchbar/switches.css diff --git a/application/views/system/logs/testSearch.php b/application/views/system/logs/testSearch.php index 57ed0d48a..861adc53d 100755 --- a/application/views/system/logs/testSearch.php +++ b/application/views/system/logs/testSearch.php @@ -15,7 +15,7 @@ ), 'customCSSs' => array( 'public/css/components/verticalsplit.css', - 'public/css/components/searchbar.css', + 'public/css/components/searchbar/searchbar.css', 'public/css/components/primevue.css', ), 'customJSModules' => array('public/js/apps/TestSearch.js') diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php index 58d6f2443..8a12338a3 100755 --- a/application/views/templates/CISHTML-Header.php +++ b/application/views/templates/CISHTML-Header.php @@ -31,6 +31,7 @@ if (!isset($menu)) { + @@ -41,7 +42,7 @@ if (!isset($menu)) {
- + diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css index 44ffc2fec..b455a6c38 100755 --- a/public/css/Cis4/Cis.css +++ b/public/css/Cis4/Cis.css @@ -1,5 +1,5 @@ /* basic */ -@import '../components/searchbar.css'; +@import '../components/searchbar/searchbar.css'; html { font-size: 0.875em; } diff --git a/public/css/components/searchbar.css b/public/css/components/searchbar/searchbar.css similarity index 83% rename from public/css/components/searchbar.css rename to public/css/components/searchbar/searchbar.css index 2bbaf9d67..5b718a90e 100755 --- a/public/css/components/searchbar.css +++ b/public/css/components/searchbar/searchbar.css @@ -3,12 +3,17 @@ Author : bambi */ +@import url(./switches.css); + +#search-filter{ + border: 1px solid #ced4da; +} + + .searchbar_settings { position: absolute; z-index: 9999; - background-color: #fff; - border: 2px solid #666; - padding: 1rem; + background-color: #343a40; } .searchbar_results { @@ -92,4 +97,11 @@ .searchbar_inline_ul li { list-style: none; -} \ No newline at end of file +} + +.non-selectable { + user-select: none; + -webkit-user-select: none; /* Safari */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* IE/Edge */ + } \ No newline at end of file diff --git a/public/css/components/searchbar/switches.css b/public/css/components/searchbar/switches.css new file mode 100644 index 000000000..164976514 --- /dev/null +++ b/public/css/components/searchbar/switches.css @@ -0,0 +1,23 @@ +.fhc-switches:checked { + background-color: white !important; + border-color: white !important; + background-position: right center !important; + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23000000'/%3e%3c/svg%3e") !important; +} + +.fhc-switches { + background-color: var(--bs-gray-600) !important; + border-color: var(--bs-gray-600) !important; + background-position: left center !important; + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%238e99a3'/%3e%3c/svg%3e") !important; +} + +.fhc-switches:focus { + box-shadow: 0 0 0 .25rem rgba(108, 117, 125,.25); +} + +/*.form-switch .form-check-input:checked { + + +rgb(52, 58, 64)*/ + diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js index 99023032d..f5180c1a0 100755 --- a/public/js/components/Cis/Menu.js +++ b/public/js/components/Cis/Menu.js @@ -28,6 +28,7 @@ export default { + diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js index 80659d5bb..963b43cb7 100755 --- a/public/js/components/searchbar/searchbar.js +++ b/public/js/components/searchbar/searchbar.js @@ -26,14 +26,14 @@ export default { employee: employee, organisationunit: organisationunit }, - template: ` + template: /*html*/`
-
+
- + type="search" :placeholder="'Search: '+ searchsettings.types.join(' / ')" aria-label="Search"> +
Unbekannter Ergebnistyp: '{{ res.type }}'.
-
-
-