ZaclysIndustries/searxngRebrandZaclys
2
0
Fork 0
forked from zaclys/searxng
Code Issues Pull requests Activity
5317 commits 3 branches 17 tags 53 MiB
Commit graph

5317 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexandre Flament
58a6738dec
Merge pull request #575 from return42/fix-source-map 
[fix] simple theme: make JS sources available on non build hosts
 2021-12-03 08:25:11 +01:00
Markus Heiser
32c5918e4d
Merge pull request #577 from searxng/dependabot/pip/master/twine-3.7.0 
Bump twine from 3.6.0 to 3.7.0
 2021-12-03 08:17:16 +01:00
dependabot[bot]
f956b2117e
Bump twine from 3.6.0 to 3.7.0 
Bumps [twine](https://github.com/pypa/twine) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/pypa/twine/releases)
- [Changelog](https://github.com/pypa/twine/blob/main/docs/changelog.rst)
- [Commits](https://github.com/pypa/twine/compare/3.6.0...3.7.0)

---
updated-dependencies:
- dependency-name: twine
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-03 07:12:18 +00:00
Markus Heiser
eb220774a6
Merge pull request #576 from searxng/dependabot/pip/master/sphinx-4.3.1 
Bump sphinx from 4.3.0 to 4.3.1
 2021-12-03 08:11:32 +01:00
dependabot[bot]
6b58987017
Bump sphinx from 4.3.0 to 4.3.1 
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/4.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v4.3.0...v4.3.1)

---
updated-dependencies:
- dependency-name: sphinx
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-03 07:04:22 +00:00
Markus Heiser
d26a746d7d [build] /static 2021-12-01 21:12:06 +01:00
Markus Heiser
f54460a805 [fix] simple theme: make JS sources available on non build hosts 
Include the source files directly in the `.map` files [1] for two reasons:

1. In the simple theme, modules from `./node_modules` are only available on
   developer's build host (a `make node.env` is needed to get the sources).  By
   example; in the `searxng.min.js.map` file, the `autocomplete.js` is linked at
   URL:

      ../node_modules/autocomplete-js/dist/autocomplete.js

2. Later, when client sources has been moved out of the `./static` URL [2] to
   the `<repo-roo>/src` folder, all JS sources are no longer available.

Drawback: `.map` files grow up in size, but this should not bother, because the
files are only loaded in debug mode.

[1] https://github.com/gruntjs/grunt-contrib-uglify#sourcemapincludesources
[2] https://github.com/searxng/searxng/issues/141

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-01 21:09:26 +01:00
Alexandre Flament
ae49b5224c
Merge pull request #566 from dalf/simple-theme-smaller-build 
[mod] simple theme: smaller build
 2021-12-01 20:30:58 +01:00
Markus Heiser
82125862c6 [fix] simple theme: remove static files no longer needed 
remove:

    searx/static/themes/simple/js/searxng.js
    searx/static/themes/simple/js/searxng.head.js
    searx/static/themes/simple/css/searxng-rtl.css
    searx/static/themes/simple/css/searxng.css

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-12-01 10:38:41 +01:00
Markus Heiser
e62733fcf3
Merge pull request #571 from searxng/update_data_update_languages.py 
Update searx.data - update_languages.py
 2021-12-01 07:30:41 +01:00
Markus Heiser
24d04f2854
Merge pull request #570 from searxng/update_data_update_firefox_version.py 
Update searx.data - update_firefox_version.py
 2021-12-01 07:29:56 +01:00
Markus Heiser
a3fc1304cc
Merge pull request #569 from searxng/update_data_update_currencies.py 
Update searx.data - update_currencies.py
 2021-12-01 07:29:24 +01:00
Markus Heiser
550a47533a
Merge pull request #568 from searxng/update_data_update_ahmia_blacklist.py 
Update searx.data - update_ahmia_blacklist.py
 2021-12-01 07:28:48 +01:00
dalf
c74b465ece Update searx.data - update_languages.py 2021-12-01 06:24:47 +00:00
dalf
56e653011f Update searx.data - update_firefox_version.py 2021-12-01 06:24:38 +00:00
dalf
b833e08fc3 Update searx.data - update_currencies.py 2021-12-01 06:24:29 +00:00
dalf
5fdf8f04b7 Update searx.data - update_ahmia_blacklist.py 2021-12-01 06:24:25 +00:00
Markus Heiser
3c4f5d9e2f
Merge pull request #567 from searxng/need-translators 
README.rst: add translation status
 2021-12-01 07:23:37 +01:00
Alexandre Flament
eb7ccb7e79
README.rst: add translation status 
Related to https://github.com/searxng/searxng/issues/540
 2021-12-01 00:08:44 +01:00
Alexandre Flament
28b22a0f98 [mod] simple theme: smaller build 
remove:
* searx/static/themes/simple/js/searxng.head.js
* searx/static/themes/simple/js/searxng.js
* searx/static/themes/simple/css/searxng-rtl.css
* searx/static/themes/simple/css/searxng.css

These files are never used.
About the js files: the .map files references the sources instead of the concated version.
 2021-11-30 23:04:37 +01:00
Alexandre Flament
632ae7d175
Merge pull request #562 from return42/fix-img-alt 
[simple] ImageLayout.watch: `img_load_error.svg` if img load fails
 2021-11-30 20:21:03 +01:00
Markus Heiser
4798acc661 [build] /static 2021-11-30 12:43:18 +01:00
Markus Heiser
7dc9cc91a8 [mod] simple theme, JS: introduce window.searxng.theme namespace 
In window.searxng.theme the theme data can be passed through to JS
implementations.

Initial the window.searxng.theme namespace starts with a value for
`img_load_error`::

    // image that is displayed if load of <img src='...'> failed
    img_load_error: 'img/img_load_error.svg'

The searx/static/themes/__common__/js/image_layout.js is patched to uses the
value, if the theme defines a value for img_load_error in this namespace.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-30 12:42:52 +01:00
Markus Heiser
eff0884498 [simple] ImageLayout.watch: img_load_error.svg if img load fails 
Show default image `img/img_load_error.svg` when image can't be loaded.

----
Some words about class ImageLayout:

The https://github.com/searxng/searxng/blob/master/searx/static/themes/simple/js/searxng.js is build by a grunt task ..

d0e21a01b4/searx/static/themes/simple/gruntfile.js (L91-L93)

The `/__common__/js/*.js` concats also https://github.com/searxng/searxng/blob/master/searx/static/themes/__common__/js/image_layout.js where a modified copy of the of the "Google-image-layout" (`ImageLayout`) is implemented [1][2][3].

[1] https://ptgamr.github.io/2014-09-12-google-image-layout/
[2] https://ptgamr.github.io/google-image-layout/src/google-image-layout.js
[3] https://github.com/ptgamr/google-image-layout/tree/master
----

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 21:10:13 +01:00
Markus Heiser
0311eba538
Merge pull request #556 from return42/fix-tooltip 
[simple theme] fix tooltip and improve background of an transparent image in the !images results
 2021-11-29 21:07:14 +01:00
Markus Heiser
f8c3acd729 [build] /static 2021-11-29 20:48:38 +01:00
Markus Heiser
fb5c1ed310 [fix] simple theme: set img background color to wallpaper's color 
The *background color* of an transparent image is the color of the color of
wallpaper on which all images are shown on.

Set variable `--color-result-image-background` and `--color-base-background` to
the same value.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 20:47:37 +01:00
Markus Heiser
c7bb6945d1 [fix] simple theme: img tile, shows duplicate information on screen 
Remove global title attribute from img tag[1][2] .  In the image result, the
title is already shown from span class title::

    <span class="title">{{ result.title|striptags }}</span>

See commit: 8fbffb1409

    [fix] simple-theme templates: polish HTML <img> elements

[1] https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img
[2] https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes#attr-title

Reported-by: @dalf https://github.com/searxng/searxng/pull/545#issuecomment-980531215
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 20:47:37 +01:00
Markus Heiser
935e5ad417
Merge pull request #558 from return42/svg-favicon 
[enh] add SVG favicon href="favicon.svg" type="image/svg+xml"
 2021-11-29 20:46:07 +01:00
Markus Heiser
0afcde071c [build] /static 2021-11-29 20:37:23 +01:00
Markus Heiser
944b73511a [enh] add SVG favicon href="favicon.svg" type="image/svg+xml" 
Add link::

    <link rel="icon" href="favicon.png" sizes="any">
    <link rel="icon" href="favicon.svg" type="image/svg+xml">

Modern browsers should request::

    INFO  werkzeug   : 127.0.0.1 - - [28/Nov/2021 17:03:07] "GET /static/themes/simple/img/favicon.svg HTTP/1.1" 200 -

[1] https://github.com/audreyfeldroy/favicon-cheat-sheet#svg-file
[2] https://dev.to/masakudamatsu/favicon-nightmare-how-to-maintain-sanity-3al7

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 20:36:31 +01:00
Markus Heiser
989f9e97f0
Merge pull request #561 from return42/fix-README 
[brand] README: add SearXNG logo
 2021-11-29 20:05:54 +01:00
Markus Heiser
e2e585319e [build] /static 2021-11-29 19:53:28 +01:00
Markus Heiser
9349c71c54 [mod] themes/simple/img/searxng.svg -> src/brand/searxng.svg 
* move `searx/static/themes/simple/img/searxng.svg` to `src/brand/searxng.svg`

* README.rst can use it without a reference to a theme.

* the simple theme can create `searx/static/themes/simple/img/searxng.png` using
  the svg2png task

Suggested-by: @dalf https://github.com/searxng/searxng/pull/561#issuecomment-981747902
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 19:53:28 +01:00
Alexandre Flament
3700094f3a
Merge pull request #557 from return42/fix-autocomplete 
[fix] route /autocompleter: escape `<` and `>` in the simple theme
 2021-11-29 16:58:15 +01:00
Markus Heiser
fd8982d53d
Merge pull request #560 from return42/fix-page-title 
[fix] query_in_title: add missing space in title
 2021-11-29 14:55:32 +01:00
Markus Heiser
e12debe9ee [brand] README: add SearXNG logo 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 13:51:18 +01:00
Markus Heiser
1f896ea509 [fix] query_in_title: add missing space in title 
Suggested-by: @unixfox https://github.com/searxng/searxng/pull/485#issuecomment-981406978
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 11:08:21 +01:00
Markus Heiser
0c8ff97d9e [fix] route /autocompleter: escape < and > in the simple theme 
This is a follow up of 9a3253fc escaping `<` and `>` in all themes.  This patch
fix issue in oscar theme

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 07:20:08 +01:00
Markus Heiser
d0e21a01b4
Merge pull request #541 from dalf/simple-theme-svg2png 
Simple theme svg2png
 2021-11-28 20:13:53 +01:00
Markus Heiser
8154dd2a2e [build] /static 2021-11-28 20:07:49 +01:00
Alexandre Flament
59f4c792b4 [mod] simple theme: use sharp instead of convert to create .png from .svg 
define a custom grunt task, since grunt-sharp is too old (it can't be installed).
in gruntfile.js, the image tasks are moved at the end the build chain.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-28 20:05:37 +01:00
Markus Heiser
8c4c4259d4 [mod] gruntfile: do some polish (no functional change) 
- remove unused 'path' constant
- fix indentation
- Put all image tasks at the end, where it is easy to list which image is processed.

Suggested -by: @dalf https://github.com/searxng/searxng/pull/541#discussion_r756247157
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-28 20:04:10 +01:00
Markus Heiser
11ba7f294f
Merge pull request #554 from return42/fix-google-video 
[fix] google-videos engine: ignore news articles
 2021-11-27 12:59:39 +01:00
Markus Heiser
f0db33e14b
Merge pull request #555 from return42/fix-autocomplete 
[fix] route /autocompleter: escape '<' and '>' in the response
 2021-11-27 09:24:58 +01:00
Markus Heiser
9a3253fc16 [fix] route /autocompleter: escape '<' and '>' in the response 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-27 08:39:48 +01:00
Markus Heiser
e27b1ac57a
Merge pull request #549 from searxng/dependabot/pip/master/pylint-2.12.1 
Bump pylint from 2.11.1 to 2.12.1
 2021-11-27 00:40:26 +01:00
dependabot[bot]
8bde693189
Bump pylint from 2.11.1 to 2.12.1 
Bumps [pylint](https://github.com/PyCQA/pylint) from 2.11.1 to 2.12.1.
- [Release notes](https://github.com/PyCQA/pylint/releases)
- [Changelog](https://github.com/PyCQA/pylint/blob/main/ChangeLog)
- [Commits](https://github.com/PyCQA/pylint/compare/v2.11.1...v2.12.1)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-26 23:36:06 +00:00
Markus Heiser
96cb7123bb
Merge pull request #553 from return42/fix-oscar 
[fix] oscar theme: use SearXNG logo and wordmark
 2021-11-27 00:34:22 +01:00
Markus Heiser
27c1b9f660
Merge pull request #551 from dalf/fix-results-lock 
[fix] searx.results: fix pylint issue "useless-with-lock"
 2021-11-27 00:28:22 +01:00