Markus Heiser
98cab4cf75
[mod] result_templates/default.html replace embedded HTML by data_src audio_src
...
Embedded HTML breaks SearXNG architecture. To modularize, HTML is generated in
the templates (oscar & simple) and result parameter 'embedded' is replaced by
'data_src' (and 'audio_src'), an URL for embedded content (<iframe>).
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Markus Heiser
46e131fdad
[mod] result_templates/videos.html: replace embedded HTML by data_src
...
Embedded HTML breaks SearXNG architecture. To modularize, HTML is generated in
the templates (oscar & simple) and result parameter 'embedded' is replaced by
'data_src', an URL for embedded content (<iframe>).
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Alexandre Flament
bf987bb608
Merge pull request #848 from not-my-profile/help-route
...
Introduce `/help` route
3 years ago
Martin Fischer
91527fbd6b
[enh] avoid /about redirect in template links
3 years ago
Martin Fischer
07936060d1
preferences: Set autocomplete=off for form
...
Otherwise you can change the value of a select,
refresh the page and the preferences stay changed,
leaving the wrong impression that they were saved.
3 years ago
Martin Fischer
14338e2c3b
[enh] generate navigation for help pages
3 years ago
Martin Fischer
fb9eedbf40
[enh] introduce /help route
...
Translation will be implemented in the future.
For now the "en" in /help/en/<pagename> is hardcoded.
3 years ago
Martin Fischer
105c5a6a98
[help] stop rendering documentation with Jinja2
...
To facilitate translation of the user documentation we move
the templating logic outside of the user documentation.
3 years ago
Martin Fischer
05149db4c1
[help] render user documentation once on startup
...
Currently we have two kinds of user documentation:
* the about page[1] which is written in HTML and part of the web
application and can therefore link instance-specific pages
(like e.g. the preferences) via Jinja variables
* the Sphinx documentation[2] which is written in reStructuredText
and cannot link instance-specific pages since it doesn't know
which instance the user is using
The plan is to integrate the user documentation currently in Sphinx
into the application, so that it can also link instance specific pages.
We also want to enable the user documentation to be translated.
This commit implements the first step in this endeavor (see #722 ).
[1]: searx/templates/__common__/about.html
[2]: docs/user/ (currently served at https://docs.searxng.org/user/ )
3 years ago
Markus Heiser
e45dfb334b
[theme] /preferences: rename "Method" to "HTTP Method"
...
Closes: https://github.com/searxng/searxng/issues/751
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Martin Fischer
cd8ce22f86
[themes] add comma before "but" in new sentence
...
Closes #739 .
3 years ago
Martin Fischer
abe53946d4
[enh] display help text for "Other" engines tab in preferences
3 years ago
Martin Fischer
ab90e2ac49
[enh] show categories not in any tab category in "Other" preferences tab
...
Previously we didn't have a good place to put search engines that don't
fit into any of the tab categories. This commit automatically puts
search engines that don't belong to any tab category in an "other"
category, that is only displayed in the user preferences (and not above
search results).
3 years ago
Martin Fischer
20a5e43e35
[enh] display language of engines in preferences
3 years ago
Martin Fischer
31e206361f
[enh] group engines in preference tabs
3 years ago
Martin Fischer
8e9ad1ccc2
[enh] introduce categories_as_tabs
...
Previously all categories were displayed as search engine tabs.
This commit changes that so that only the categories listed under
categories_as_tabs in settings.yml are displayed.
This lets us introduce more categories without cluttering up the UI.
Categories not displayed as tabs can still be searched with !bangs.
3 years ago
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>
3 years ago
mrpaulblack
0bb4d6b296
[oscar theme] center search on index and use logo with ponthi
3 years ago
Markus Heiser
e54a06bae7
[fix] oscar theme: use SearXNG logo and wordmark
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Markus Heiser
3f3097c772
[fix] templates: remove unneeded escape \' of single quotation mark
...
Strings like::
'Query in the page\'s title'
are hard to read / remove escape sequence by using double quotation marks for
strings ::
"Query in the page's title"
BTW: remove a leading dot in the simple theme [1].
[1] 80fb77476f (r756112716)
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Alexandre Flament
42c1a938f0
Merge pull request #485 from dalf/pref_query_in_title
...
[mod] new preference: query_in_title
3 years ago
Alexandre Flament
dfbbc3b471
[fix] simple theme: /preferences: add tokens field
...
include changes to display input text field in the preferences
3 years ago
Alexandre Flament
80fb77476f
[mod] new preference: query_in_title
...
* disable by default
* settings.yml: ui.query_in_title
* in /preferences: privacy tab
when enabled, the result page's title contains the user query.
previously:
* oscar theme: the query was always included
* simple theme: the query was included with the GET method
3 years ago
Markus Heiser
9730371199
[fix] typos reported from weblate translators
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Alexandre Flament
988910d451
[fix] templates: lang attribute of html uses hyphen
...
https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes#attr-lang
https://www.w3.org/TR/REC-xml/#sec-lang-tag
3 years ago
Alexandre Flament
df06dddc04
SearXNG: oscar theme
3 years ago
Alexandre Flament
2f1384f198
[enh] themes: display the engine descriptions
3 years ago
MrPaulBlack
644ccf16be
[theme] make engine stats clickable
3 years ago
MrPaulBlack
48d4296caa
[theme] link to engine stats in footer
3 years ago
Markus Heiser
0240ca9567
[fix] oscar template - merge the two class attributes into one
...
Suggested-by: @dalf https://github.com/searxng/searxng/pull/295#discussion_r703337237
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Markus Heiser
9068a72c6a
[fix] oscar theme - preferences: rename col-checkbox/col-stat
...
[1] https://github.com/searxng/searxng/pull/295#discussion_r703318053
[2] https://github.com/searxng/searxng/pull/295#discussion_r703337237
Suggested-by: @dalf [1] [2]
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Markus Heiser
222031e975
[fix] make oscar theme more CSP compliant - col-checkbox
...
Add col-checkbox in::
searx/static/themes/oscar/src/less/preferences.less
Replaced style in file::
searx/templates/oscar/preferences.html
Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Markus Heiser
9d106ae972
[fix] make oscar theme more CSP compliant - default-image-style
...
Add default-image-style in::
searx/static/themes/oscar/src/less/result_templates.less
Replaced style= in files::
./oscar/result_templates/default.html:19: <img src="{{ image_proxify(result.img_src or result.thumbnail) }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content">
./oscar/result_templates/files.html:24:<img src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content">
Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Markus Heiser
e564cef0fe
[fix] make /preferences more CSP compliant - simple & oscar theme
...
In simple & oscar theme remove ``style=`` properties which violates CSP but seem
not to have a magnification in GUI (UX).
Fixed files::
./oscar/preferences.html:25:<td class="{{ label }}" style="padding: 2px">{{- "" -}}
./simple/preferences.html:39:<td class="{{ label }}" style="padding: 2px; width: 13rem;">{{- "" -}}
./simple/preferences.html:77: <div class="engine-tooltip" style="right: 12rem;" role="tooltip" id="{{engine_name}}_reliability">
./simple/preferences.html:258: <p class="text-muted" style="margin:20px 0;">
Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Markus Heiser
ad528c706e
[fix] make result template map more CSP compliant - simple & oscar
...
Add osm-map-box in::
searx/static/themes/__common__/less/result_templates.less
Replaced sty= in files::
./oscar/result_templates/map.html:64: <div style="height:300px; width:100%; margin: 10px 0;" id="osm-map-{{ index }}"></div>
./simple/result_templates/map.html:65: <div id="result-map-{{ index }}" class="invisible"><div id="osm-map-{{ index }}" style="height:300px; width:100%; margin: 10px 0;" ></div></div>
Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Markus Heiser
48c806954e
[fix] make /preferences more CSP compliant - simple & oscar theme
...
in simple & oscar theme replace bar-graph's *styles* by CSP compliant
implementation in::
searx/static/themes/__common__/less/stats.less
Fixed files::
./oscar/preferences.html:29: <span style="width: calc(max(2px, 100%*{{ (stats[engine_name].time / max_rate95)|round(3) }}))" class="stacked-bar-chart-median"></span>{{- "" -}}
./oscar/preferences.html:30: <span style="width: calc(100%*{{ ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate80"></span>{{- "" -}}
./oscar/preferences.html:31: <span style="width: calc(100%*{{ ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate95"></span>{{- "" -}}
./simple/preferences.html:43: <span style="width: calc(max(2px, 100%*{{ (stats[engine_name].time / max_rate95)|round(3) }}))" class="stacked-bar-chart-median"></span>{{- "" -}}
./simple/preferences.html:44: <span style="width: calc(100%*{{ ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate80"></span>{{- "" -}}
./simple/preferences.html:45: <span style="width: calc(100%*{{ ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate95"></span>{{- "" -}}
Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Alexandre Flament
4b43775c91
version based on the git repository
...
This commit remove the need to update the brand for GIT_URL and GIT_BRANCH:
there are read from the git repository.
It is possible to call python -m searx.version freeze to freeze the current version.
Useful when the code is installed outside git (distro package, docker, etc...)
3 years ago
Markus Heiser
3f638ed196
[mod] drop usage of the searx.brand namespace (templates & /config)
...
In the templates and the /config (JSON) the usage of the 'brand.*' name
space is replaced by 'searx.get_setting' function.
- new_issue_url --> get_setting('brand.new_issue_url')
- brand.GIT_URL --> get_setting('brand.git_url')
- brand.PUBLIC_INSTANCES --> get_setting('brand.public_instances')
- brand.DOCS_URL --> get_setting('brand.docs_url')
- brand.ISSUE_URL --> get_setting('brand.issue_url')
- brand.CONTACT_URL --> get_setting('general.contact_url', '')
The macro 'new_issue' from searx/templates/*/messages/no_results.html
is now imported with context::
{% from '__common__/new_issue.html' import new_issue with context %}
To get *public instances URL* from context's 'get_setting()' function::
get_setting('brand.public_instances','')
Macro's prototype does no longer need the 'new_issue_url' argument and has been
changed to::
macro new_issue(engine_name, engine_reliability)
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Alexandre Flament
881659ca9d
[mod] oscar theme: /preferences : HTML detail order match visual tabs
...
First details about the general tab, then detail about UI tab, etc...
No functionnal change
3 years ago
Alexandre Flament
f83b64270c
[mod] oscar theme /preferences: reorganize the preferences
...
close #115
3 years ago
Markus Heiser
bf10b4a857
[fix] openstreetmap - fix some minor whitespace & indentation issues
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Alexandre Flament
c75425655f
[enh] openstreetmap / map template: improve results
...
implements ideas described in #69
* update the engine
* use wikidata
* update map.html template
3 years ago
Alexandre Flament
7457f3fe40
Merge pull request #124 from return42/searx-merge
...
merge redis offline engine from searx
3 years ago
Alexandre Flament
a89b823f8d
[mod] remove overpass API call
...
prepare the code the PR #90
3 years ago
Adam Tauber
e33858d6ef
[fix] correct kv template formatting and remove internal data
...
Slightly modified merge of commit [ea7ccf24] from searx.
[ea7ccf24] https://github.com/searx/searx/commit/ea7ccf24
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Markus Heiser
6ed4616da9
[enh] add settings option to enable/disable search formats
...
Access to formats can be denied by settings configuration::
search:
formats: [html, csv, json, rss]
Closes: https://github.com/searxng/searxng/issues/95
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Alexandre Flament
99aaf86b73
[fix] offline engines: fix templates /stats and /preferences
3 years ago
Markus Heiser
0507e185a5
[fix] bar graph and rename CSS class engine-scores -> engine-score
...
- drop #main_stats selector in stats.less
- 'engine-score' exists before this PR.
- untabify searx/static/themes/__common__/less/stats.less
for details see comment at: d93bec7638..1204e4f07e (r633571496)
Suggested-by: @dalf in commit 1204e4f0
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Markus Heiser
34859d0e58
[fix] make /stats more CSP compliant - oscar theme
...
Replace oscar theme's *styles* (see below) by CSP compliant implementation in
``searx/static/themes/__common__/less/stats.less`` ::
./oscar/stats.html:29: <th scope="col" style="width:20rem;">{{ th_sort('name', _("Engine name")) }}</th>
./oscar/stats.html:30: <th scope="col" style="width:7rem; text-align: right;">{{ th_sort('score', _('Scores')) }}</th>
./oscar/stats.html:33: <th scope="col" style="text-align: right;">{{ th_sort('reliability', _('Reliability')) }}</th>
./oscar/stats.html:38: <td style="text-align: right;">
./oscar/stats.html:91: <td style="text-align: right;"> {{ engine_reliabilities.get(engine_stat.name, {}).get('reliablity') }}</td>
./oscar/stats.html:109: <tbody style="padding-top: 1rem;">
./oscar/stats.html:112: <th scope="row" style="width: 10rem">{{ _('Exception') }}</th><td>{{ error.exception_classname }}</td>
./oscar/stats.html:114: <th scope="row" style="width: 10rem">{{ _('Message') }}</th><td>{{ error.log_message }}</td>
./oscar/stats.html:116: <th scope="row" style="width: 10rem">{{ _('Percentage') }}</th><td style="width: 10rem">{{ error.percentage }}</td>
./oscar/stats.html:121: <span style="border-right: 1px solid gray; padding: 0 1rem 0 0; margin: 0 0 0 0.5rem;">{{ param }}</span>
./oscar/stats.html:138: <th scope="col" style="width: 10rem">{{ _('Failed test') }}</th>
Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago
Markus Heiser
cdfb4b7ff9
[fix] make /stats more CSP compliant - bar graph
...
Replace bar graph's *styles* (see below) by CSP compliant implementation in
``searx/static/themes/__common__/less/stats.less`` ::
./simple/stats.html:49: <span style="width: calc(max(2px, 100%*{{ (engine_stat.result_count / engine_stats.max_result_count )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
./simple/stats.html:57: <span style="width: calc(max(2px, 100%*{{ (engine_stat.http / engine_stats.max_time )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
./simple/stats.html:58: <span style="width: calc(100%*{{ engine_stat.processing / engine_stats.max_time |round(3) }})" class="stacked-bar-chart-serie2"></span>{{- "" -}}
./oscar/stats.html:50: <span style="width: calc(max(2px, 100%*{{ (engine_stat.result_count / engine_stats.max_result_count )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
./oscar/stats.html:58: <span style="width: calc(max(2px, 100%*{{ (engine_stat.http / engine_stats.max_time )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
./oscar/stats.html:59: <span style="width: calc(100%*{{ engine_stat.processing / engine_stats.max_time |round(3) }})" class="stacked-bar-chart-serie2"></span>{{- "" -}}
Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
3 years ago