diff --git a/searx/static/themes/oscar/css/logicodev-dark.css b/searx/static/themes/oscar/css/logicodev-dark.css index 989440579..3a73378a1 100644 --- a/searx/static/themes/oscar/css/logicodev-dark.css +++ b/searx/static/themes/oscar/css/logicodev-dark.css @@ -1532,7 +1532,7 @@ p.btn.btn-default { .label-danger { background: #ad1f12 none !important; } -.searx-navbar { +.searxng-navbar { background: #333334; height: 2.3rem; font-size: 1.3rem; @@ -1541,13 +1541,13 @@ p.btn.btn-default { font-weight: bold; margin-bottom: 0.8rem; } -.searx-navbar a, -.searx-navbar a:hover { +.searxng-navbar a, +.searxng-navbar a:hover { margin-right: 2rem; color: white; text-decoration: none; } -.searx-navbar .instance a { +.searxng-navbar .instance a { color: #01D7D4; margin-left: 2rem; } diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css b/searx/static/themes/oscar/css/logicodev-dark.min.css index 0bae02f02..05ccd3ea3 100644 Binary files a/searx/static/themes/oscar/css/logicodev-dark.min.css and b/searx/static/themes/oscar/css/logicodev-dark.min.css differ diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css.map b/searx/static/themes/oscar/css/logicodev-dark.min.css.map index 18d3cc5e7..32293f3a4 100644 Binary files a/searx/static/themes/oscar/css/logicodev-dark.min.css.map and b/searx/static/themes/oscar/css/logicodev-dark.min.css.map differ diff --git a/searx/static/themes/oscar/css/logicodev.css b/searx/static/themes/oscar/css/logicodev.css index dfd0af4df..76883b577 100644 --- a/searx/static/themes/oscar/css/logicodev.css +++ b/searx/static/themes/oscar/css/logicodev.css @@ -732,7 +732,7 @@ color: #D19A66; } /* Literal.Number.Integer.Long */ -.searx-navbar { +.searxng-navbar { background: #29314D; height: 2.3rem; font-size: 1.3rem; @@ -741,13 +741,13 @@ font-weight: bold; margin-bottom: 0.8rem; } -.searx-navbar a, -.searx-navbar a:hover { +.searxng-navbar a, +.searxng-navbar a:hover { margin-right: 2rem; color: white; text-decoration: none; } -.searx-navbar .instance a { +.searxng-navbar .instance a { color: #01D7D4; margin-left: 2rem; } diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css index f8b7cca21..239ca1be7 100644 Binary files a/searx/static/themes/oscar/css/logicodev.min.css and b/searx/static/themes/oscar/css/logicodev.min.css differ diff --git a/searx/static/themes/oscar/css/logicodev.min.css.map b/searx/static/themes/oscar/css/logicodev.min.css.map index 51dc57f81..9c9d446fc 100644 Binary files a/searx/static/themes/oscar/css/logicodev.min.css.map and b/searx/static/themes/oscar/css/logicodev.min.css.map differ diff --git a/searx/static/themes/oscar/css/pointhi.css b/searx/static/themes/oscar/css/pointhi.css index 9810041ec..5a4839fac 100644 --- a/searx/static/themes/oscar/css/pointhi.css +++ b/searx/static/themes/oscar/css/pointhi.css @@ -1037,7 +1037,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not .cursor-pointer { cursor: pointer !important; } -.searx-navbar { +.searxng-navbar { background: #eee; color: #aaa; height: 2.3rem; @@ -1047,12 +1047,12 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not font-weight: bold; margin-bottom: 1.3rem; } -.searx-navbar a, -.searx-navbar a:hover { +.searxng-navbar a, +.searxng-navbar a:hover { margin-right: 2rem; text-decoration: none; } -.searx-navbar .instance a { +.searxng-navbar .instance a { color: #444; margin-left: 2rem; } diff --git a/searx/static/themes/oscar/css/pointhi.min.css b/searx/static/themes/oscar/css/pointhi.min.css index 9c0aa5eb0..c1bcac02c 100644 Binary files a/searx/static/themes/oscar/css/pointhi.min.css and b/searx/static/themes/oscar/css/pointhi.min.css differ diff --git a/searx/static/themes/oscar/css/pointhi.min.css.map b/searx/static/themes/oscar/css/pointhi.min.css.map index 806766060..0767750d7 100644 Binary files a/searx/static/themes/oscar/css/pointhi.min.css.map and b/searx/static/themes/oscar/css/pointhi.min.css.map differ diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js deleted file mode 100644 index 067284a55..000000000 Binary files a/searx/static/themes/oscar/js/searx.min.js and /dev/null differ diff --git a/searx/static/themes/oscar/js/searx.min.js.map b/searx/static/themes/oscar/js/searx.min.js.map deleted file mode 100644 index 5ed94db43..000000000 Binary files a/searx/static/themes/oscar/js/searx.min.js.map and /dev/null differ diff --git a/searx/static/themes/oscar/js/searx.js b/searx/static/themes/oscar/js/searxng.js similarity index 82% rename from searx/static/themes/oscar/js/searx.js rename to searx/static/themes/oscar/js/searxng.js index 7209ea073..247672df5 100644 --- a/searx/static/themes/oscar/js/searx.js +++ b/searx/static/themes/oscar/js/searxng.js @@ -1,20 +1,11 @@ /** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * - * (C) 2019 by Alexandre Flament + * @license + * (C) Copyright Contributors to the SearXNG project. + * (C) Copyright Contributors to the searx project (2014 - 2021). + * SPDX-License-Identifier: AGPL-3.0-or-later */ -window.searx = (function(d) { + +window.searxng = (function(d) { 'use strict'; // @@ -32,26 +23,19 @@ window.searx = (function(d) { translations: JSON.parse(script.getAttribute('data-translations')) }; })(document); + +window.searx = {}; ;/** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * + * @license + * (C) Copyright Contributors to the SearXNG project. + * (C) Copyright Contributors to the searx project (2014 - 2021). * (C) 2014 by Thomas Pointhuber, + * SPDX-License-Identifier: AGPL-3.0-or-later */ $(document).ready(function(){ var original_search_value = ''; - if(searx.autocompleter) { + if(searxng.autocompleter) { var searchResults = new Bloodhound({ datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'), queryTokenizer: Bloodhound.tokenizers.whitespace, @@ -93,20 +77,11 @@ $(document).ready(function(){ } }); ;/** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * + * @license + * (C) Copyright Contributors to the SearXNG project. + * (C) Copyright Contributors to the searx project (2014 - 2021). * (C) 2014 by Thomas Pointhuber, + * SPDX-License-Identifier: AGPL-3.0-or-later */ $(document).ready(function(){ @@ -206,10 +181,17 @@ $(document).ready(function(){ /** * Layout images according to their sizes */ - searx.image_thumbnail_layout = new searx.ImageLayout('#main_results', '#main_results .result-images', 'img.img-thumbnail', 15, 200); - searx.image_thumbnail_layout.watch(); + searxng.image_thumbnail_layout = new searx.ImageLayout('#main_results', '#main_results .result-images', 'img.img-thumbnail', 15, 200); + searxng.image_thumbnail_layout.watch(); }); -;window.addEventListener('load', function() { +;/** + * @license + * (C) Copyright Contributors to the SearXNG project. + * (C) Copyright Contributors to the searx project (2014 - 2021). + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +window.addEventListener('load', function() { // Hide infobox toggle if shrunk size already fits all content. $('.infobox').each(function() { var infobox_body = $(this).find('.infobox_body'); @@ -221,24 +203,15 @@ $(document).ready(function(){ }); }); ;/** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * + * @license + * (C) Copyright Contributors to the SearXNG project. + * (C) Copyright Contributors to the searx project (2014 - 2021). * (C) 2014 by Thomas Pointhuber, + * SPDX-License-Identifier: AGPL-3.0-or-later */ $(document).ready(function(){ - $(".searx_init_map").on( "click", function( event ) { + $(".searxng_init_map").on( "click", function( event ) { var leaflet_target = $(this).data('leaflet-target'); var map_lon = $(this).data('map-lon'); var map_lat = $(this).data('map-lat'); @@ -299,7 +272,14 @@ $(document).ready(function(){ $( this ).off( event ); }); }); -;$(document).ready(function(){ +;/** + * @license + * (C) Copyright Contributors to the SearXNG project. + * (C) Copyright Contributors to the searx project (2014 - 2021). + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +$(document).ready(function(){ let engine_descriptions = null; function load_engine_descriptions() { if (engine_descriptions == null) { @@ -308,7 +288,7 @@ $(document).ready(function(){ for (const [engine_name, description] of Object.entries(data)) { let elements = $('[data-engine-name="' + engine_name + '"] .description'); for(const element of elements) { - let source = ' (' + searx.translations['Source'] + ': ' + description[1] + ')'; + let source = ' (' + searxng.translations.Source + ': ' + description[1] + ')'; element.innerHTML = description[0] + source; } } @@ -322,7 +302,14 @@ $(document).ready(function(){ }); } }); -;$(document).ready(function(){ +;/** + * @license + * (C) Copyright Contributors to the SearXNG project. + * (C) Copyright Contributors to the searx project (2014 - 2021). + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +$(document).ready(function(){ $("#allow-all-engines").click(function() { $(".onoffswitch-checkbox").each(function() { this.checked = false;}); }); diff --git a/searx/static/themes/oscar/js/searxng.min.js b/searx/static/themes/oscar/js/searxng.min.js new file mode 100644 index 000000000..8e164a8fb Binary files /dev/null and b/searx/static/themes/oscar/js/searxng.min.js differ diff --git a/searx/static/themes/oscar/js/searxng.min.js.map b/searx/static/themes/oscar/js/searxng.min.js.map new file mode 100644 index 000000000..e9e43b629 Binary files /dev/null and b/searx/static/themes/oscar/js/searxng.min.js.map differ