Merge branch 'master' of https://github.com/moa-engine/moa

moa-engine · May 30, 2024 · 517fba1 · 517fba1
2 parents ee058a4 + 0ef2ab3
commit 517fba1
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 32 deletions.
diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css b/searx/static/themes/simple/css/searxng-rtl.min.css
diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css.map b/searx/static/themes/simple/css/searxng-rtl.min.css.map
diff --git a/searx/static/themes/simple/css/searxng.min.css b/searx/static/themes/simple/css/searxng.min.css
diff --git a/searx/static/themes/simple/css/searxng.min.css.map b/searx/static/themes/simple/css/searxng.min.css.map
diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js
@@ -195,6 +195,10 @@ module.exports = function (grunt) {
           'people-outline': 'node_modules/ionicons/dist/svg/people-outline.svg',
           'heart-outline': 'node_modules/ionicons/dist/svg/heart-outline.svg',
           'information-circle-outline': 'src/svg/information-circle-outline.svg',
+          'library-outline': 'node_modules/ionicons/dist/svg/library-outline.svg',
+          'cube-outline': 'node_modules/ionicons/dist/svg/cube-outline.svg',
+          'chatbubbles-outline': 'node_modules/ionicons/dist/svg/chatbubbles-outline.svg',
+          'ellipsis-horizontal-outline': 'node_modules/ionicons/dist/svg/ellipsis-horizontal-outline.svg',
         },
         dest: '../../../templates/simple/icons.html',
       },

diff --git a/searx/static/themes/simple/js/searxng.reactivity.min.js b/searx/static/themes/simple/js/searxng.reactivity.min.js
diff --git a/searx/static/themes/simple/js/searxng.reactivity.min.js.map b/searx/static/themes/simple/js/searxng.reactivity.min.js.map
diff --git a/searx/static/themes/simple/src/js/reactivity.js b/searx/static/themes/simple/src/js/reactivity.js
@@ -39,13 +39,35 @@ function videosPreview() {
   $("#checkbox_videos").checked = true;
 }
 
-function infoboxMore() {
-  $$(".infobox").forEach((infobox) => {
-    const moreBtn = infobox.querySelector(".infobox-more-btn")
-    if (moreBtn) {
-      moreBtn.addEventListener("click", () => {
-        infobox.classList.toggle("collapse-open");
-      })
+// Watch for new #filters-btn & #infobox-more-btn elements and add event listener
+const observer = new MutationObserver((mutationsList) => {
+  for (const mutation of mutationsList) {
+    if (mutation.type === 'childList') {
+      mutation.addedNodes.forEach((node) => {
+        if (node.nodeType === Node.ELEMENT_NODE) {
+          if (node.id === 'filters-btn') {
+            node.onclick = function() {
+              toggleBtn(this, 'filters-visible', '.search_filters', 'invisible');
+            };
+          } else if (node.id ==='infobox-more-btn') {
+            const {parentNode} = node;
+            if (parentNode && parentNode.classList && parentNode.classList.contains('infobox')) {
+              node.onclick = function() {
+                parentNode.classList.toggle("collapse-open");
+              };
+            }
+          }
+          const filtersBtnDescendants = node.querySelectorAll && node.querySelectorAll('#filters-btn');
+          if (filtersBtnDescendants && filtersBtnDescendants.forEach) {
+            filtersBtnDescendants.forEach((descendant) => {
+              descendant.onclick = function() {
+                toggleBtn(this, 'filters-visible', '.search_filters', 'invisible');
+              };
+            });
+          }
+        }
+      });
     }
-  })
-}
+  }
+});
+observer.observe(document.body, { childList: true, subtree: true });
diff --git a/searx/static/themes/simple/src/less/definitions.less b/searx/static/themes/simple/src/less/definitions.less
@@ -111,13 +111,13 @@
   --color-toolkit-input-text-font: #222;
   --color-toolkit-checkbox-onoff-off-background: #ddd;
   --color-toolkit-checkbox-onoff-on-background: #ddd;
-  --color-toolkit-checkbox-onoff-on-mark-background: #3050ff;
+  --color-toolkit-checkbox-onoff-on-mark-background: @secondary-color;
   --color-toolkit-checkbox-onoff-on-mark-color: #fff;
   --color-toolkit-checkbox-onoff-off-mark-background: #aaa;
   --color-toolkit-checkbox-onoff-off-mark-color: #fff;
   --color-toolkit-checkbox-label-background: #ddd;
   --color-toolkit-checkbox-label-border: #ddd;
-  --color-toolkit-checkbox-input-border: #3050ff;
+  --color-toolkit-checkbox-input-border: @secondary-color;
   --color-toolkit-engine-tooltip-border: #ddd;
   --color-toolkit-engine-tooltip-background: #fff;
   --color-toolkit-loader-border: rgba(0, 0, 0, 0.2);
@@ -226,13 +226,13 @@
   --color-toolkit-input-text-font: #fff;
   --color-toolkit-checkbox-onoff-off-background: #313338;
   --color-toolkit-checkbox-onoff-on-background: #313338;
-  --color-toolkit-checkbox-onoff-on-mark-background: #58f;
+  --color-toolkit-checkbox-onoff-on-mark-background: @primary-color;
   --color-toolkit-checkbox-onoff-on-mark-color: #222;
   --color-toolkit-checkbox-onoff-off-mark-background: #ddd;
   --color-toolkit-checkbox-onoff-off-mark-color: #222;
   --color-toolkit-checkbox-label-background: #222;
   --color-toolkit-checkbox-label-border: #333;
-  --color-toolkit-checkbox-input-border: #58f;
+  --color-toolkit-checkbox-input-border: @primary-color;
   --color-toolkit-engine-tooltip-border: #333;
   --color-toolkit-engine-tooltip-background: #222;
   --color-toolkit-loader-border: rgba(255, 255, 255, 0.2);

diff --git a/searx/static/themes/simple/src/less/detail.less b/searx/static/themes/simple/src/less/detail.less
@@ -20,6 +20,7 @@ article.result-images .detail {
   top: @search-height;
   transition: top 0.064s ease-in 0s;
   bottom: 0;
+  align-items: center;
   background: var(--color-result-detail-background);
   border: 1px solid var(--color-result-detail-background);
   z-index: 10000;
@@ -56,6 +57,7 @@ article.result-images .detail {
   .result-images-labels {
     color: var(--color-result-detail-font);
     height: 19rem;
+    width: 100%;
 
     hr {
       border-top: 1px solid var(--color-result-detail-hr);
@@ -103,7 +105,6 @@ article.result-images .detail {
     .result-detail{
       background-color: var(--color-search-background);
       display: flex;
-      max-width: calc(100% - 5rem);
       flex-direction: column;
       justify-content: space-evenly;
       .rounded-corners;
@@ -144,7 +145,7 @@ article.result-images .detail {
     display: flex;
     bottom: 1rem;
     position: absolute;
-    width: calc(100% - 6rem);
+    align-items: center;
     justify-content: center;
 
     a.result-detail-previous {
@@ -170,8 +171,8 @@ article.result-images .detail {
   a.result-detail-next,
   a.result-detail-previous {
     display: block;
-    width: 1.5rem;
-    height: 1.5rem;
+    width: 2rem;
+    height: 2rem;
     filter: opacity(40%);
     z-index: 2000002;
 

diff --git a/searx/static/themes/simple/src/less/search.less b/searx/static/themes/simple/src/less/search.less
@@ -373,6 +373,7 @@ html.no-js #clear_search.hide_if_nojs {
 
   .search_box {
     width: calc(100% - 1rem);
+    margin: 0 auto;
     display: flex;
   }
 

diff --git a/searx/templates/simple/categories.html b/searx/templates/simple/categories.html
@@ -2,7 +2,7 @@
 'general': 'search-outline', 'images': 'image-outline', 'videos':
 'play-outline', 'news': 'newspaper-outline', 'map': 'location-outline', 'music':
 'musical-notes-outline', 'it': 'layers-outline', 'science': 'school-outline',
-'files': 'file-tray-full-outline', 'social media': 'people-outline', } -%}
+'files': 'file-tray-full-outline', 'social media': 'people-outline', 'dictionaries': 'library-outline', 'packages': 'cube-outline', 'q&a': 'chatbubbles-outline', 'other': 'ellipsis-horizontal-outline', } -%}
 <div id="categories" class="search_categories">
     {{- '' -}}
     <div id="categories_container">
@@ -27,7 +27,7 @@
             {{- '\n' -}}
         {%- endif -%}
         {%- if display_tooltip -%}
-        <span id="filters-btn" class="category filters-btn-tablet" onclick="toggleBtn(this, 'filters-visible', '.search_filters', 'invisible')"
+        <span id="filters-btn" class="category filters-btn-tablet"
                 >{{ icon('funnel-outline') }}</span>
         {%- endif -%}
     </div>{{- '' -}}

diff --git a/searx/templates/simple/elements/infobox.html b/searx/templates/simple/elements/infobox.html
@@ -61,12 +61,9 @@ <h1 class="title">
             {%- endif -%} {%- if infobox.attributes and infobox.urls -%}
         </div>
     </div>
-    <div class="infobox-more-btn">
+    <div id="infobox-more-btn" class="infobox-more-btn">
         <span class="btn">{{ icon('chevron-up-outline') }}</span>
     </div>
-    <script defer>
-        infoboxMore();
-    </script>
     {%- endif -%} {%- if infobox.relatedTopics -%}
     <div class="relatedTopics">
         {%- for topic in infobox.relatedTopics -%}