Commit Graph

6083 Commits

Author SHA1 Message Date
Markus Heiser 2486cdc2dc [build] /static 2022-03-20 18:12:42 +01:00
Alexandre Flament 6eae697c73 simple theme: upgrade some of dependencies
* less-plugin-clean-css: no updated version.
  @wikipedia/less-plugin-clean-css might be an alternative.

* stylelint & stylelint-config-standard
  the new versions require configuration and source code changes
2022-03-20 18:10:24 +01:00
Markus Heiser fd5fcdedce [interim fix] static files can't be delivered by HTTP.
Since PR 932 [1][2] static files can't be delivered by HTTP server any longer.

This patch makes the hash paramter in the URL of static files:

    /static/themes/simple/css/searxng.min.css?5fde34a74bc438c7b56ec8c6501e131cc9914bd8

optional.  By default the hash parameter is disabled.

HINT:

  Instances that do not deliver static files by their HTTP server and have a
  long expire time [3] should enable this option.

----

This is only a interim solution, on the long run:

    make static.build.commit

creates files including the file name:

    css/searxng-5fde34a74bc438c7b56ec8c6501e131cc9914bd8.min.css

and a mapping.json with this content[4]

[1] https://github.com/searxng/searxng/issues/964
[2] https://github.com/searxng/searxng/pull/932#issuecomment-1067039518
[3] 5583336440
[4] https://github.com/searxng/searxng/pull/932#issuecomment-1067216426

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-20 16:28:14 +01:00
Alexandre Flament b25f118d64
Merge pull request #990 from dalf/searxng_base_url
settings.yml: allow to base_url with the SEARXNG_BASE_URL env variable
2022-03-20 09:15:15 +01:00
Markus Heiser 3201aa1b3f
Merge pull request #859 from return42/fix-814
[mod] add i18n infrastructure for SearXNG message files (searxng.msg)
2022-03-20 08:31:07 +01:00
Markus Heiser bc30309939
Merge pull request #992 from return42/fix-987
[fix] settings.yml: ui.results_on_new_tab
2022-03-19 23:14:03 +01:00
Markus Heiser e4a2bfba38 [fix] settings.yml: ui.results_on_new_tab
Closes: https://github.com/searxng/searxng/issues/987
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-19 23:06:21 +01:00
Alexandre Flament 96605d4330
Merge pull request #991 from dalf/fix-894
Fix 894
2022-03-19 21:20:29 +01:00
Alexandre Flament 2366345429 [build] /static 2022-03-19 20:51:51 +01:00
Alexandre Flament 84340f56ec simple theme: JS version: the reset button clear the text
The <input type="reset"> introduced in the PR 894, restores the default value.
It works in the index page, but it doesn't work in the /search page:
the reset button restore the initial query.

This PR:
* fix the JS version: the reset button clear the text
* keep the clear button in the / page
* hide the clear button in the /search page
2022-03-19 20:49:37 +01:00
Paul Braeuning be8d2f4949
Merge pull request #989 from return42/fix-945
[fix] simple theme: open preferences with general tab
2022-03-19 20:22:00 +01:00
Alexandre Flament 8d83787318 settings.yml: allow to base_url with the SEARXNG_BASE_URL env variable
Related to https://github.com/searxng/searxng-docker/pull/12
2022-03-19 20:20:13 +01:00
Markus Heiser 076c6889d3 [fix] simple theme: open preferences with general tab
BTW: fix also the category tab to open with category 'general'

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-19 19:55:54 +01:00
Paul Braeuning c3c2a623fe
Merge pull request #988 from mrpaulblack/fix-pr-894
[simple theme] fix small CSS issue from #894
2022-03-19 19:33:00 +01:00
mrpaulblack f428dea87c [build] /static 2022-03-19 18:02:33 +01:00
mrpaulblack 3620d006a4 [fix] naming of id for prefs in css 2022-03-19 18:02:10 +01:00
Paul Braeuning 27adcc7037
Merge pull request #985 from dalf/docker-log
docker: log to stdout
2022-03-19 17:10:59 +01:00
Markus Heiser 2e4557f3f3 [fix] languages: show country name even if there is only one country
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-19 16:45:14 +01:00
Markus Heiser a25e3767d4 [fix] don't show flags for languages without region identifier
SearXNG shows two different things:

region:
  "de-CH" is the equivalent of "Schweiz (de)" in DDG.

languages:
  "en" doesn't say anything about the location. It is up the engines to do their
  best to select English results without a region.

Suggested-by: @dalf https://github.com/searxng/searxng/pull/967#issuecomment-1072979693
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-19 15:09:13 +01:00
Markus Heiser 2841abaf55 [mod] add flags to the languages filter
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-19 15:09:13 +01:00
Markus Heiser 7625da9fa0
Merge pull request #986 from dalf/fix-startpage-fetch_supported_languages
fix startpage: update XPath in _fetch_supported_languages
2022-03-19 14:49:22 +01:00
Alexandre Flament 378b29be2f fix startpage: update XPath in _fetch_supported_languages 2022-03-19 14:16:37 +01:00
Alexandre Flament 12d3fe3214 docker: log to stdout
previously the log (only the exceptions) were log
into /var/log/uwsgi/uwsgi.log

this is disturbing for the admins:
* they see an internal error on HTTP port
* no log where they are expected (docker logs)

this commit fixes this issue
2022-03-19 13:47:45 +01:00
Alexandre Flament b692035120
Merge pull request #894 from dalf/simple-aria-1
[enh] simple: basic ARIA fixes
2022-03-19 12:00:03 +01:00
Markus Heiser 6ccd557650
Merge pull request #983 from return42/fix-dep
[revert interim] bump sphinx-tabs from interim fix to 3.3.1
2022-03-18 11:38:25 +01:00
Markus Heiser c7a21b96f0 [revert interim] bump sphinx-tabs from interim fix to 3.3.1
The bugfix of sphinx-tabs issue 152 [1] has been released, we can bump the
version and remove the interim return42/sphinx-tabs.git@fix-152 branch.

[1] https://github.com/executablebooks/sphinx-tabs/issues/152
[2] https://github.com/searxng/searxng/pull/954#issuecomment-1064888261

Closes: https://github.com/searxng/searxng/pull/954
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-18 11:22:58 +01:00
Markus Heiser 750724cb23
Merge pull request #981 from searxng/translations_update
Update translations
2022-03-18 08:41:33 +01:00
searxng-bot 06ff1ad967 [translations] update from Weblate
5ef4a876 - 2022-03-16 - Joseph Ko <eaglclaws@gmail.com>
4f81930f - 2022-03-16 - Markus Heiser <markus.heiser@darmarit.de>
7d2abf90 - 2022-03-17 - Markus Heiser <markus.heiser@darmarit.de>
87d5542e - 2022-03-16 - Markus Heiser <markus.heiser@darmarit.de>
d39c1e67 - 2022-03-16 - Joseph Ko <eaglclaws@gmail.com>
7b0c3b03 - 2022-03-16 - Joseph Ko <eaglclaws@gmail.com>
fc37b695 - 2022-03-16 - Joseph Ko <eaglclaws@gmail.com>
7df01eea - 2022-03-16 - Joseph Ko <eaglclaws@gmail.com>
56af42c2 - 2022-03-13 - Markus Heiser <markus.heiser@darmarit.de>
4b17697d - 2022-03-14 - Joseph Ko <eaglclaws@gmail.com>
f5523f9d - 2022-03-12 - Markus Heiser <markus.heiser@darmarit.de>
04998001 - 2022-03-12 - Nik Drešar <nik.dresar@gmail.com>
e6f4d878 - 2022-03-13 - AHOHNMYC <lqwh2h2cwa@protonmail.com>
ede86266 - 2022-03-11 - Matheus Henrique <niletcode@gmail.com>
362b7f2e - 2022-03-12 - Markus Heiser <markus.heiser@darmarit.de>
da14280c - 2022-03-13 - Markus Heiser <markus.heiser@darmarit.de>
d68537d2 - 2022-03-12 - PLefebvreBJO <contact@plefebvrebjo.com>
da27e825 - 2022-03-12 - Markus Heiser <markus.heiser@darmarit.de>
1d00cc00 - 2022-03-12 - Markus Heiser <markus.heiser@darmarit.de>
2022-03-18 07:17:25 +00:00
Alexandre Flament 26d47fe587
Merge pull request #975 from return42/fix-723
[fix] remove unmaintained searx/templates/simple/simple.spec.txt
2022-03-17 19:41:23 +01:00
Markus Heiser 3922612775 [fix] remove unmaintained searx/templates/simple/simple.spec.txt
Files hasn't been updated since it initial commit in 2017

Closes: https://github.com/searxng/searxng/issues/723
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-17 11:38:00 +01:00
Markus Heiser 8c78c895a3
Merge pull request #969 from dalf/fix_info
Fix info
2022-03-17 01:37:10 +01:00
Alexandre Flament dbe3eaabc9 Info: code refactoring & bug fixes 2022-03-16 22:26:36 +01:00
Alexandre Flament bb19c7eccf Sphinx doc: rename "User documentation" to "User Information" 2022-03-16 22:26:36 +01:00
Markus Heiser 22cc4d3e5c
Merge pull request #968 from mrpaulblack/normalize-info-page
[simple theme] Normalize info page
2022-03-16 21:24:49 +01:00
mrpaulblack a1776ff57d [build] /static 2022-03-16 21:01:42 +01:00
mrpaulblack 6a8e168e25 [simple theme] use default font and font-size in info page 2022-03-16 21:01:22 +01:00
Markus Heiser 9622dbbc6b [upd] searx/translations/messages.pot
generated by::

  ./manage pyenv.cmd pybabel extract \
      -F babel.cfg \
      -o "searx/translations/messages.pot"\
      "searx/"

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-16 09:55:53 +01:00
Markus Heiser 784bf9ed15 [mod] move category and names of constants to searx/searxng.msg
Closes: https://github.com/searxng/searxng/issues/814
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-16 09:55:53 +01:00
Markus Heiser b9cf3c82a1 [mod] add i18n infrastructure for SearXNG message files (searxng.msg)
With this patch ``searxng.msg`` files can be added to SearXNG.  In
``searxng.msg`` files messages can be defined which are not captured by babel's
gettext, like the generic names of the categories or messages that are stored in
constants.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-16 09:55:53 +01:00
Markus Heiser cd92a7eacd
Merge pull request #930 from return42/merge-user-doc2
Integrate the user documentation into the application
2022-03-13 23:12:46 +01:00
Alexandre Flament 1157462ff9 Various change on PR 930 2022-03-13 22:22:02 +01:00
Markus Heiser e847313007
Merge pull request #949 from return42/fix-inst-scripts
Fix and improve installtion scripts in /utils
2022-03-12 18:41:18 +01:00
Markus Heiser 7308a6e33c [LXC] ubuntu 20.10 EOL, upgrade to ubunut 21.10 [1]
[1] https://wiki.ubuntu.com/Releases

Tested by::

    # build the container ..
    $ sudo -H ./utils/lxc.sh build searx-ubu2110

    # open a shell in the container
    $ sudo -H ./utils/lxc.sh cmd searx-ubu2110 bash
    [root@searx-ubu2110 SearXNG]#

    # install a complete SearXNG suite ..
    [root@searx-ubu2110 SearXNG]# ./utils/searx.sh install all
    ...

    # install apache to export the SearXNG instance by HTTP
    [root@searx-ubu2110 SearXNG]# ./utils/searx.sh apache install
    ...
    INFO:  got 200 from http://10.174.184.94/searx

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-12 18:00:45 +01:00
Markus Heiser 1c79c1a3d2 [LXC] fedora33 EOL [1], upgrade to fedora35 [2]
[1] https://docs.fedoraproject.org/en-US/releases/eol/
[2] https://docs.fedoraproject.org/en-US/releases/f35/

Tested by::

    # build the container ..
    $ sudo -H ./utils/lxc.sh build searx-fedora35

    # open a shell in the container
    $ sudo -H ./utils/lxc.sh cmd searx-fedora35 bash
    [root@searx-fedora35 SearXNG]#

    # install a complete SearXNG suite ..
    [root@searx-fedora35 SearXNG]# ./utils/searx.sh install all
    ...

    # install apache to export the SearXNG instance by HTTP
    [root@searx-fedora35 SearXNG]# ./utils/searx.sh apache install
    ...
    INFO:  got 200 from http://10.174.184.94/searx

To build wheel `python3-devel` needs to be added to SEARX_PACKAGES_fedora::

    |searx|   × Building wheel for setproctitle (pyproject.toml) did not run successfully.
    |searx|   │ exit code: 1
    ...
    |searx|       In file included from src/spt.h:15,
    |searx|                        from src/setproctitle.c:14:
    |searx|       src/spt_python.h:16:10: fatal error: Python.h: No such file or directory
    |searx|          16 | #include <Python.h>
    |searx|             |          ^~~~~~~~~~
    |searx|       compilation terminated.
    |searx|       error: command '/usr/bin/gcc' failed with exit code 1
    |searx|       [end of output]
    ...
    |searx|   ERROR: Failed building wheel for setproctitle

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-12 17:44:00 +01:00
Markus Heiser 59100e8525 [fix] add module for backward compatibility
cache_property has been added in py3.8 [1]

To support cache_property in py3.7 the implementation from 3.8 has been
copied to compat.py.  This code can be cleanup with EOL of py3.7.

[1] https://docs.python.org/3/library/functools.html#functools.cached_property

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-12 15:45:28 +01:00
Markus Heiser 8751940169 [interim fix] of sphinx-tabs and sphinx-jinja
The myst-parser requires >= docutils v.0.17 what ends in a dependency hell where
plugins sphinx-tabs and sphinx-jinja we use are involved.

This patch can be reverted when [2], [3], [4]  are solved and new release is
available / see [1].

[1] https://github.com/searxng/searxng/pull/954
[2] https://github.com/executablebooks/sphinx-tabs/issues/152
[3] https://github.com/executablebooks/sphinx-tabs/pull/153
[4] https://github.com/executablebooks/sphinx-tabs/pull/154

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-12 14:25:34 +01:00
Markus Heiser 8d83e4aeff [build] /static 2022-03-12 11:36:31 +01:00
Markus Heiser 3633dc5611 [simple] add CSS for /info pages
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-12 11:36:31 +01:00
Markus Heiser b1912607ae [mod] replace /help by /info pages and include pages in project docs
This patch implements a bolierplate to share content from info-pages of the
SearXNG instance (URL /info) with the project documentation (path /docs/user).

The info pages are using Markdown (CommonMark), to include them in the project
documentation (reST) the myst-parser [1] is used in the Sphinx-doc build chain.

If base_url is known (defined in settings.yml) links to the instance are also
inserted into the project documentation::

    searxng_extra/docs_prebuild

[1] https://www.sphinx-doc.org/en/master/usage/markdown.html

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2022-03-12 11:36:31 +01:00
Alexandre Flament 6c7dca52e7
Merge pull request #946 from searxng/readme-link-screenshots
README.rst: add a link to the screenshots
2022-03-11 21:20:03 +01:00