Stylize search descriptions.

emaijala · Oct 29, 2023 · 42f6861 · 42f6861
1 parent 4f7796b
commit 42f6861
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 15 deletions.
diff --git a/css/style.css b/css/style.css
diff --git a/css/style.css.map b/css/style.css.map
diff --git a/css/style.scss b/css/style.scss
@@ -196,6 +196,14 @@ div.function_navi {
   font-weight: 600;
 }
 
+.search-comparison {
+  color: $primary;
+}
+
+.search-join, .search-join-groups {
+  color: $success;
+}
+
 .list_container {
   margin-top: 10px;
   max-width: 1400px;
@@ -1060,4 +1068,9 @@ table.quick-search {
   width: 100%;
 }
 
+// Fix conflict between Bootstrap dropdown menu and DataTables dropdown menu:
+.dt-buttons .dropdown-menu {
+  display: initial;
+}
+
 @import "table";
diff --git a/search.php b/search.php
@@ -210,9 +210,8 @@ public function resultsAction()
         }
         $type = $searchData['type'];
 
-        $terms = htmlentities(
-            $this->getSearchDescription($type, $searchData['searchGroups'])
-        ) ?: Translator::translate('NoSearchTerms');
+        $terms = $this->getSearchDescription($type, $searchData['searchGroups'])
+            ?: Translator::translate('NoSearchTerms');
         $searchDesc = Translator::translate(
             'ResultsForSearch',
             ['%%description%%' => $terms]
@@ -284,7 +283,7 @@ public function editSearchesAction(): void
             ];
             header('Location: index.php?' . http_build_query($params));
             exit();
-        } elseif ('delete' === $action && ($searchId = getPost('search') > 0)) {
+        } elseif ('delete' === $action && ($searchId = getPost('search')) > 0) {
             deleteQuickSearch($searchId);
         } elseif ('search' === $action) {
             $params = [
@@ -730,17 +729,23 @@ protected function getSearchDescription(string $type, array $searchGroups)
                 }
 
                 $joins = [
-                  'eq' => ' = ',
-                  'ne' => ' != ',
-                  'lt' => ' < ',
-                  'lte' => ' <= ',
-                  'gt' => ' > ',
-                  'gte' => ' >= '
+                    'eq' => '=',
+                    'ne' => '!=',
+                    'lt' => '<',
+                    'lte' => '<=',
+                    'gt' => '>',
+                    'gte' => '>='
                 ];
-                $expressions[] = Translator::translate($type) . ($joins[$field['comparison']] ?? ' = ') . $value;
+                $expressions[] = '<span class="search-type">'
+                    . Translator::translate($type)
+                    . '</span> <span class="search-comparison">'
+                    . ($joins[$field['comparison']] ?? '=')
+                    . '</span> <span class="search-value">'
+                    . htmlspecialchars($value)
+                    . '</span>';
             }
             $groups[] = implode(
-                ' ' . Translator::translate('Search' . $groupOperator) . ' ',
+                ' <span class="search-join">' . Translator::translate('Search' . $groupOperator) . '</span> ',
                 $expressions
             );
         }
@@ -753,7 +758,7 @@ function ($s) {
             );
         }
         return implode(
-            ' ' . Translator::translate('Search' . $operator) . ' ',
+            ' <span class="search-join-groups">' . Translator::translate('Search' . $operator) . '</span> ',
             $groups
         );
     }