diff --git a/searx/static/oscar/img/searx.png b/searx/static/oscar/img/searx.png deleted file mode 100644 index e162da50..00000000 Binary files a/searx/static/oscar/img/searx.png and /dev/null differ diff --git a/searx/static/oscar/img/searx_logo.png b/searx/static/oscar/img/searx_logo.png new file mode 100644 index 00000000..26be6def Binary files /dev/null and b/searx/static/oscar/img/searx_logo.png differ diff --git a/searx/static/oscar/js/scripts.js b/searx/static/oscar/js/scripts.js index 1cef5889..1254b158 100644 --- a/searx/static/oscar/js/scripts.js +++ b/searx/static/oscar/js/scripts.js @@ -12,15 +12,11 @@ $(document).ready(function(){ var btnClass = 'btn-' + $(this).data('btn-class'); var btnLabelDefault = $(this).data('btn-label-default'); var btnLabelToggled = $(this).data('btn-label-toggled'); - if(btnLabelToggled != '') - { - if($(this).hasClass('btn-default')) - { + if(btnLabelToggled != '') { + if($(this).hasClass('btn-default')) { var html = $(this).html().replace(btnLabelDefault, btnLabelToggled); - } - else - { + } else { var html = $(this).html().replace(btnLabelToggled, btnLabelDefault); } $(this).html(html); @@ -28,4 +24,18 @@ $(document).ready(function(){ $(this).toggleClass(btnClass); $(this).toggleClass('btn-default'); }); + + $('.btn-collapse').click(function() { + var btnTextCollapsed = $(this).data('btn-text-collapsed'); + var btnTextNotCollapsed = $(this).data('btn-text-not-collapsed'); + + if(btnTextCollapsed != '' && btnTextNotCollapsed != '') { + if($(this).hasClass('collapsed')) { + var html = $(this).html().replace(btnTextCollapsed, btnTextNotCollapsed); + } else { + var html = $(this).html().replace(btnTextNotCollapsed, btnTextCollapsed); + } + $(this).html(html); + } + }); }); diff --git a/searx/templates/oscar/index.html b/searx/templates/oscar/index.html index 0c9a7306..adb535d9 100644 --- a/searx/templates/oscar/index.html +++ b/searx/templates/oscar/index.html @@ -1,6 +1,15 @@ {% extends "oscar/base.html" %} {% block content %} -
-

searx

+
+
+
+

searx logosearx

+
+
+
+
+ {% include 'oscar/search.html' %} +
+
{% endblock %} diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html new file mode 100644 index 00000000..f61de201 --- /dev/null +++ b/searx/templates/oscar/macros.html @@ -0,0 +1,3 @@ +{% macro icon(action) -%} + +{%- endmacro %} diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html new file mode 100644 index 00000000..f44d48ad --- /dev/null +++ b/searx/templates/oscar/search.html @@ -0,0 +1,17 @@ +{% from 'oscar/macros.html' import icon %} + +