diff options
author | Adam Tauber <asciimoo@gmail.com> | 2016-09-22 23:51:07 +0200 |
---|---|---|
committer | Adam Tauber <asciimoo@gmail.com> | 2016-09-22 23:51:07 +0200 |
commit | bee7b497a300622f5ba2b619817f5c89c29ae871 (patch) | |
tree | 525c3d85020cedd88663a4bb4a0e18c54500044b | |
parent | aaf5d506e51197603922d7b9d259c0f4e498f62b (diff) | |
download | searxng-bee7b497a300622f5ba2b619817f5c89c29ae871.tar.gz searxng-bee7b497a300622f5ba2b619817f5c89c29ae871.zip |
[mod] rename "default" theme to "legacy"
-rwxr-xr-x | manage.sh | 4 | ||||
-rw-r--r-- | searx/settings_robot.yml | 2 | ||||
-rw-r--r-- | searx/static/themes/legacy/css/style-rtl.css (renamed from searx/static/themes/default/css/style-rtl.css) | 0 | ||||
-rw-r--r-- | searx/static/themes/legacy/css/style.css (renamed from searx/static/themes/default/css/style.css) | 0 | ||||
-rw-r--r-- | searx/static/themes/legacy/img/favicon.png (renamed from searx/static/themes/default/img/favicon.png) | bin | 2060 -> 2060 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/github_ribbon.png (renamed from searx/static/themes/default/img/github_ribbon.png) | bin | 5213 -> 5213 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_500px.ico (renamed from searx/static/themes/default/img/icons/icon_500px.ico) | bin | 8348 -> 8348 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_bing.ico (renamed from searx/static/themes/default/img/icons/icon_bing.ico) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_dailymotion.ico (renamed from searx/static/themes/default/img/icons/icon_dailymotion.ico) | bin | 4286 -> 4286 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_deezer.ico (renamed from searx/static/themes/default/img/icons/icon_deezer.ico) | bin | 4286 -> 4286 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_deviantart.ico (renamed from searx/static/themes/default/img/icons/icon_deviantart.ico) | bin | 4286 -> 4286 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_digg.ico (renamed from searx/static/themes/default/img/icons/icon_digg.ico) | bin | 2868 -> 2868 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_duckduckgo.ico (renamed from searx/static/themes/default/img/icons/icon_duckduckgo.ico) | bin | 32988 -> 32988 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_flickr.ico (renamed from searx/static/themes/default/img/icons/icon_flickr.ico) | bin | 6518 -> 6518 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_github.ico (renamed from searx/static/themes/default/img/icons/icon_github.ico) | bin | 6518 -> 6518 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_google play apps.ico (renamed from searx/static/themes/default/img/icons/icon_google play apps.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_google play movies.ico (renamed from searx/static/themes/default/img/icons/icon_google play movies.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_google play music.ico (renamed from searx/static/themes/default/img/icons/icon_google play music.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_google.ico (renamed from searx/static/themes/default/img/icons/icon_google.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_kickass.ico (renamed from searx/static/themes/default/img/icons/icon_kickass.ico) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_openstreetmap.ico (renamed from searx/static/themes/default/img/icons/icon_openstreetmap.ico) | bin | 1406 -> 1406 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_searchcode code.ico (renamed from searx/static/themes/default/img/icons/icon_searchcode code.ico) | bin | 4094 -> 4094 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_searchcode doc.ico (renamed from searx/static/themes/default/img/icons/icon_searchcode doc.ico) | bin | 4094 -> 4094 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_searchcode.ico (renamed from searx/static/themes/default/img/icons/icon_searchcode.ico) | bin | 4094 -> 4094 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_soundcloud.ico (renamed from searx/static/themes/default/img/icons/icon_soundcloud.ico) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_stackoverflow.ico (renamed from searx/static/themes/default/img/icons/icon_stackoverflow.ico) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_startpage.ico (renamed from searx/static/themes/default/img/icons/icon_startpage.ico) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_subtitleseeker.ico (renamed from searx/static/themes/default/img/icons/icon_subtitleseeker.ico) | bin | 1406 -> 1406 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_twitter.ico (renamed from searx/static/themes/default/img/icons/icon_twitter.ico) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_vimeo.ico (renamed from searx/static/themes/default/img/icons/icon_vimeo.ico) | bin | 6518 -> 6518 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_wikipedia.ico (renamed from searx/static/themes/default/img/icons/icon_wikipedia.ico) | bin | 2734 -> 2734 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_yahoo.ico (renamed from searx/static/themes/default/img/icons/icon_yahoo.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/icons/icon_youtube.ico (renamed from searx/static/themes/default/img/icons/icon_youtube.ico) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/preference-icon.png (renamed from searx/static/themes/default/img/preference-icon.png) | bin | 532 -> 532 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/search-icon.png (renamed from searx/static/themes/default/img/search-icon.png) | bin | 2329 -> 2329 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/searx.png (renamed from searx/static/themes/default/img/searx.png) | bin | 3902 -> 3902 bytes | |||
-rw-r--r-- | searx/static/themes/legacy/img/searx_logo.svg (renamed from searx/static/themes/default/img/searx_logo.svg) | 0 | ||||
-rw-r--r-- | searx/static/themes/legacy/js/searx.js (renamed from searx/static/themes/default/js/searx.js) | 0 | ||||
-rw-r--r-- | searx/static/themes/legacy/less/autocompleter.less (renamed from searx/static/themes/default/less/autocompleter.less) | 0 | ||||
-rw-r--r-- | searx/static/themes/legacy/less/code.less (renamed from searx/static/themes/default/less/code.less) | 0 | ||||
-rw-r--r-- | searx/static/themes/legacy/less/definitions.less (renamed from searx/static/themes/default/less/definitions.less) | 0 | ||||
-rw-r--r-- | searx/static/themes/legacy/less/mixins.less (renamed from searx/static/themes/default/less/mixins.less) | 0 | ||||
-rw-r--r-- | searx/static/themes/legacy/less/search.less (renamed from searx/static/themes/default/less/search.less) | 0 | ||||
-rw-r--r-- | searx/static/themes/legacy/less/style-rtl.less (renamed from searx/static/themes/default/less/style-rtl.less) | 0 | ||||
-rw-r--r-- | searx/static/themes/legacy/less/style.less (renamed from searx/static/themes/default/less/style.less) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/404.html (renamed from searx/templates/default/404.html) | 2 | ||||
-rw-r--r-- | searx/templates/legacy/about.html (renamed from searx/templates/default/about.html) | 4 | ||||
-rw-r--r-- | searx/templates/legacy/base.html (renamed from searx/templates/default/base.html) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/categories.html (renamed from searx/templates/default/categories.html) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/github_ribbon.html (renamed from searx/templates/default/github_ribbon.html) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/index.html (renamed from searx/templates/default/index.html) | 6 | ||||
-rw-r--r-- | searx/templates/legacy/infobox.html (renamed from searx/templates/default/infobox.html) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/opensearch.xml (renamed from searx/templates/default/opensearch.xml) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/opensearch_response_rss.xml (renamed from searx/templates/default/opensearch_response_rss.xml) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/preferences.html (renamed from searx/templates/default/preferences.html) | 4 | ||||
-rw-r--r-- | searx/templates/legacy/result_templates/code.html (renamed from searx/templates/default/result_templates/code.html) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/result_templates/default.html (renamed from searx/templates/default/result_templates/default.html) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/result_templates/images.html (renamed from searx/templates/default/result_templates/images.html) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/result_templates/map.html (renamed from searx/templates/default/result_templates/map.html) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/result_templates/torrent.html (renamed from searx/templates/default/result_templates/torrent.html) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/result_templates/videos.html (renamed from searx/templates/default/result_templates/videos.html) | 0 | ||||
-rw-r--r-- | searx/templates/legacy/results.html (renamed from searx/templates/default/results.html) | 10 | ||||
-rw-r--r-- | searx/templates/legacy/search.html (renamed from searx/templates/default/search.html) | 2 | ||||
-rw-r--r-- | searx/templates/legacy/stats.html (renamed from searx/templates/default/stats.html) | 2 | ||||
-rw-r--r-- | searx/templates/pix-art/preferences.html | 2 | ||||
-rw-r--r-- | searx/templates/pix-art/stats.html | 2 | ||||
-rw-r--r-- | tests/robot/test_basic.robot | 4 | ||||
-rw-r--r-- | tests/unit/test_webapp.py | 4 |
68 files changed, 24 insertions, 24 deletions
@@ -53,8 +53,8 @@ build_style() { styles() { echo '[!] Building styles' - build_style themes/default/less/style.less themes/default/css/style.css - build_style themes/default/less/style-rtl.less themes/default/css/style-rtl.css + build_style themes/legacy/less/style.less themes/legacy/css/style.css + build_style themes/legacy/less/style-rtl.less themes/legacy/css/style-rtl.css build_style themes/courgette/less/style.less themes/courgette/css/style.css build_style themes/courgette/less/style-rtl.less themes/courgette/css/style-rtl.css build_style less/bootstrap/bootstrap.less css/bootstrap.min.css diff --git a/searx/settings_robot.yml b/searx/settings_robot.yml index 7c7c4eec2..1ae084155 100644 --- a/searx/settings_robot.yml +++ b/searx/settings_robot.yml @@ -15,7 +15,7 @@ server: ui: themes_path : "" - default_theme : default + default_theme : legacy default_locale : "" outgoing: diff --git a/searx/static/themes/default/css/style-rtl.css b/searx/static/themes/legacy/css/style-rtl.css index 65ad6638e..65ad6638e 100644 --- a/searx/static/themes/default/css/style-rtl.css +++ b/searx/static/themes/legacy/css/style-rtl.css diff --git a/searx/static/themes/default/css/style.css b/searx/static/themes/legacy/css/style.css index 71422bc94..71422bc94 100644 --- a/searx/static/themes/default/css/style.css +++ b/searx/static/themes/legacy/css/style.css diff --git a/searx/static/themes/default/img/favicon.png b/searx/static/themes/legacy/img/favicon.png Binary files differindex 1a43d7fa6..1a43d7fa6 100644 --- a/searx/static/themes/default/img/favicon.png +++ b/searx/static/themes/legacy/img/favicon.png diff --git a/searx/static/themes/default/img/github_ribbon.png b/searx/static/themes/legacy/img/github_ribbon.png Binary files differindex 3799c2ea1..3799c2ea1 100644 --- a/searx/static/themes/default/img/github_ribbon.png +++ b/searx/static/themes/legacy/img/github_ribbon.png diff --git a/searx/static/themes/default/img/icons/icon_500px.ico b/searx/static/themes/legacy/img/icons/icon_500px.ico Binary files differindex b01aa20b5..b01aa20b5 100644 --- a/searx/static/themes/default/img/icons/icon_500px.ico +++ b/searx/static/themes/legacy/img/icons/icon_500px.ico diff --git a/searx/static/themes/default/img/icons/icon_bing.ico b/searx/static/themes/legacy/img/icons/icon_bing.ico Binary files differindex 5702749c1..5702749c1 100644 --- a/searx/static/themes/default/img/icons/icon_bing.ico +++ b/searx/static/themes/legacy/img/icons/icon_bing.ico diff --git a/searx/static/themes/default/img/icons/icon_dailymotion.ico b/searx/static/themes/legacy/img/icons/icon_dailymotion.ico Binary files differindex b161a57fb..b161a57fb 100644 --- a/searx/static/themes/default/img/icons/icon_dailymotion.ico +++ b/searx/static/themes/legacy/img/icons/icon_dailymotion.ico diff --git a/searx/static/themes/default/img/icons/icon_deezer.ico b/searx/static/themes/legacy/img/icons/icon_deezer.ico Binary files differindex d38c9b1f6..d38c9b1f6 100644 --- a/searx/static/themes/default/img/icons/icon_deezer.ico +++ b/searx/static/themes/legacy/img/icons/icon_deezer.ico diff --git a/searx/static/themes/default/img/icons/icon_deviantart.ico b/searx/static/themes/legacy/img/icons/icon_deviantart.ico Binary files differindex 26c353325..26c353325 100644 --- a/searx/static/themes/default/img/icons/icon_deviantart.ico +++ b/searx/static/themes/legacy/img/icons/icon_deviantart.ico diff --git a/searx/static/themes/default/img/icons/icon_digg.ico b/searx/static/themes/legacy/img/icons/icon_digg.ico Binary files differindex 162e57038..162e57038 100644 --- a/searx/static/themes/default/img/icons/icon_digg.ico +++ b/searx/static/themes/legacy/img/icons/icon_digg.ico diff --git a/searx/static/themes/default/img/icons/icon_duckduckgo.ico b/searx/static/themes/legacy/img/icons/icon_duckduckgo.ico Binary files differindex d093082cb..d093082cb 100644 --- a/searx/static/themes/default/img/icons/icon_duckduckgo.ico +++ b/searx/static/themes/legacy/img/icons/icon_duckduckgo.ico diff --git a/searx/static/themes/default/img/icons/icon_flickr.ico b/searx/static/themes/legacy/img/icons/icon_flickr.ico Binary files differindex e2304c587..e2304c587 100644 --- a/searx/static/themes/default/img/icons/icon_flickr.ico +++ b/searx/static/themes/legacy/img/icons/icon_flickr.ico diff --git a/searx/static/themes/default/img/icons/icon_github.ico b/searx/static/themes/legacy/img/icons/icon_github.ico Binary files differindex 133f0ca35..133f0ca35 100644 --- a/searx/static/themes/default/img/icons/icon_github.ico +++ b/searx/static/themes/legacy/img/icons/icon_github.ico diff --git a/searx/static/themes/default/img/icons/icon_google play apps.ico b/searx/static/themes/legacy/img/icons/icon_google play apps.ico Binary files differindex 74c84470b..74c84470b 100644 --- a/searx/static/themes/default/img/icons/icon_google play apps.ico +++ b/searx/static/themes/legacy/img/icons/icon_google play apps.ico diff --git a/searx/static/themes/default/img/icons/icon_google play movies.ico b/searx/static/themes/legacy/img/icons/icon_google play movies.ico Binary files differindex 74c84470b..74c84470b 100644 --- a/searx/static/themes/default/img/icons/icon_google play movies.ico +++ b/searx/static/themes/legacy/img/icons/icon_google play movies.ico diff --git a/searx/static/themes/default/img/icons/icon_google play music.ico b/searx/static/themes/legacy/img/icons/icon_google play music.ico Binary files differindex 74c84470b..74c84470b 100644 --- a/searx/static/themes/default/img/icons/icon_google play music.ico +++ b/searx/static/themes/legacy/img/icons/icon_google play music.ico diff --git a/searx/static/themes/default/img/icons/icon_google.ico b/searx/static/themes/legacy/img/icons/icon_google.ico Binary files differindex f594697d2..f594697d2 100644 --- a/searx/static/themes/default/img/icons/icon_google.ico +++ b/searx/static/themes/legacy/img/icons/icon_google.ico diff --git a/searx/static/themes/default/img/icons/icon_kickass.ico b/searx/static/themes/legacy/img/icons/icon_kickass.ico Binary files differindex 4aa2c77a5..4aa2c77a5 100644 --- a/searx/static/themes/default/img/icons/icon_kickass.ico +++ b/searx/static/themes/legacy/img/icons/icon_kickass.ico diff --git a/searx/static/themes/default/img/icons/icon_openstreetmap.ico b/searx/static/themes/legacy/img/icons/icon_openstreetmap.ico Binary files differindex b65863656..b65863656 100644 --- a/searx/static/themes/default/img/icons/icon_openstreetmap.ico +++ b/searx/static/themes/legacy/img/icons/icon_openstreetmap.ico diff --git a/searx/static/themes/default/img/icons/icon_searchcode code.ico b/searx/static/themes/legacy/img/icons/icon_searchcode code.ico Binary files differindex dc099ef70..dc099ef70 100644 --- a/searx/static/themes/default/img/icons/icon_searchcode code.ico +++ b/searx/static/themes/legacy/img/icons/icon_searchcode code.ico diff --git a/searx/static/themes/default/img/icons/icon_searchcode doc.ico b/searx/static/themes/legacy/img/icons/icon_searchcode doc.ico Binary files differindex dc099ef70..dc099ef70 100644 --- a/searx/static/themes/default/img/icons/icon_searchcode doc.ico +++ b/searx/static/themes/legacy/img/icons/icon_searchcode doc.ico diff --git a/searx/static/themes/default/img/icons/icon_searchcode.ico b/searx/static/themes/legacy/img/icons/icon_searchcode.ico Binary files differindex dc099ef70..dc099ef70 100644 --- a/searx/static/themes/default/img/icons/icon_searchcode.ico +++ b/searx/static/themes/legacy/img/icons/icon_searchcode.ico diff --git a/searx/static/themes/default/img/icons/icon_soundcloud.ico b/searx/static/themes/legacy/img/icons/icon_soundcloud.ico Binary files differindex 4130bea1b..4130bea1b 100644 --- a/searx/static/themes/default/img/icons/icon_soundcloud.ico +++ b/searx/static/themes/legacy/img/icons/icon_soundcloud.ico diff --git a/searx/static/themes/default/img/icons/icon_stackoverflow.ico b/searx/static/themes/legacy/img/icons/icon_stackoverflow.ico Binary files differindex b2242bc6c..b2242bc6c 100644 --- a/searx/static/themes/default/img/icons/icon_stackoverflow.ico +++ b/searx/static/themes/legacy/img/icons/icon_stackoverflow.ico diff --git a/searx/static/themes/default/img/icons/icon_startpage.ico b/searx/static/themes/legacy/img/icons/icon_startpage.ico Binary files differindex 44b94a986..44b94a986 100644 --- a/searx/static/themes/default/img/icons/icon_startpage.ico +++ b/searx/static/themes/legacy/img/icons/icon_startpage.ico diff --git a/searx/static/themes/default/img/icons/icon_subtitleseeker.ico b/searx/static/themes/legacy/img/icons/icon_subtitleseeker.ico Binary files differindex 9a0565558..9a0565558 100644 --- a/searx/static/themes/default/img/icons/icon_subtitleseeker.ico +++ b/searx/static/themes/legacy/img/icons/icon_subtitleseeker.ico diff --git a/searx/static/themes/default/img/icons/icon_twitter.ico b/searx/static/themes/legacy/img/icons/icon_twitter.ico Binary files differindex b4a71699a..b4a71699a 100644 --- a/searx/static/themes/default/img/icons/icon_twitter.ico +++ b/searx/static/themes/legacy/img/icons/icon_twitter.ico diff --git a/searx/static/themes/default/img/icons/icon_vimeo.ico b/searx/static/themes/legacy/img/icons/icon_vimeo.ico Binary files differindex 4fe4336da..4fe4336da 100644 --- a/searx/static/themes/default/img/icons/icon_vimeo.ico +++ b/searx/static/themes/legacy/img/icons/icon_vimeo.ico diff --git a/searx/static/themes/default/img/icons/icon_wikipedia.ico b/searx/static/themes/legacy/img/icons/icon_wikipedia.ico Binary files differindex e70021849..e70021849 100644 --- a/searx/static/themes/default/img/icons/icon_wikipedia.ico +++ b/searx/static/themes/legacy/img/icons/icon_wikipedia.ico diff --git a/searx/static/themes/default/img/icons/icon_yahoo.ico b/searx/static/themes/legacy/img/icons/icon_yahoo.ico Binary files differindex 9bd1d9f7c..9bd1d9f7c 100644 --- a/searx/static/themes/default/img/icons/icon_yahoo.ico +++ b/searx/static/themes/legacy/img/icons/icon_yahoo.ico diff --git a/searx/static/themes/default/img/icons/icon_youtube.ico b/searx/static/themes/legacy/img/icons/icon_youtube.ico Binary files differindex 977887dbb..977887dbb 100644 --- a/searx/static/themes/default/img/icons/icon_youtube.ico +++ b/searx/static/themes/legacy/img/icons/icon_youtube.ico diff --git a/searx/static/themes/default/img/preference-icon.png b/searx/static/themes/legacy/img/preference-icon.png Binary files differindex 8bdee641d..8bdee641d 100644 --- a/searx/static/themes/default/img/preference-icon.png +++ b/searx/static/themes/legacy/img/preference-icon.png diff --git a/searx/static/themes/default/img/search-icon.png b/searx/static/themes/legacy/img/search-icon.png Binary files differindex d70310b5d..d70310b5d 100644 --- a/searx/static/themes/default/img/search-icon.png +++ b/searx/static/themes/legacy/img/search-icon.png diff --git a/searx/static/themes/default/img/searx.png b/searx/static/themes/legacy/img/searx.png Binary files differindex a98f12a1d..a98f12a1d 100644 --- a/searx/static/themes/default/img/searx.png +++ b/searx/static/themes/legacy/img/searx.png diff --git a/searx/static/themes/default/img/searx_logo.svg b/searx/static/themes/legacy/img/searx_logo.svg index 67a2d4588..67a2d4588 100644 --- a/searx/static/themes/default/img/searx_logo.svg +++ b/searx/static/themes/legacy/img/searx_logo.svg diff --git a/searx/static/themes/default/js/searx.js b/searx/static/themes/legacy/js/searx.js index d6d5b74bb..d6d5b74bb 100644 --- a/searx/static/themes/default/js/searx.js +++ b/searx/static/themes/legacy/js/searx.js diff --git a/searx/static/themes/default/less/autocompleter.less b/searx/static/themes/legacy/less/autocompleter.less index db9601aeb..db9601aeb 100644 --- a/searx/static/themes/default/less/autocompleter.less +++ b/searx/static/themes/legacy/less/autocompleter.less diff --git a/searx/static/themes/default/less/code.less b/searx/static/themes/legacy/less/code.less index a688dd98d..a688dd98d 100644 --- a/searx/static/themes/default/less/code.less +++ b/searx/static/themes/legacy/less/code.less diff --git a/searx/static/themes/default/less/definitions.less b/searx/static/themes/legacy/less/definitions.less index 0ac0cc90c..0ac0cc90c 100644 --- a/searx/static/themes/default/less/definitions.less +++ b/searx/static/themes/legacy/less/definitions.less diff --git a/searx/static/themes/default/less/mixins.less b/searx/static/themes/legacy/less/mixins.less index dbccce6e3..dbccce6e3 100644 --- a/searx/static/themes/default/less/mixins.less +++ b/searx/static/themes/legacy/less/mixins.less diff --git a/searx/static/themes/default/less/search.less b/searx/static/themes/legacy/less/search.less index d285ca734..d285ca734 100644 --- a/searx/static/themes/default/less/search.less +++ b/searx/static/themes/legacy/less/search.less diff --git a/searx/static/themes/default/less/style-rtl.less b/searx/static/themes/legacy/less/style-rtl.less index eac53c1f8..eac53c1f8 100644 --- a/searx/static/themes/default/less/style-rtl.less +++ b/searx/static/themes/legacy/less/style-rtl.less diff --git a/searx/static/themes/default/less/style.less b/searx/static/themes/legacy/less/style.less index 4374f7d68..4374f7d68 100644 --- a/searx/static/themes/default/less/style.less +++ b/searx/static/themes/legacy/less/style.less diff --git a/searx/templates/default/404.html b/searx/templates/legacy/404.html index 1d88f86c4..05c14e155 100644 --- a/searx/templates/default/404.html +++ b/searx/templates/legacy/404.html @@ -1,4 +1,4 @@ -{% extends "default/base.html" %} +{% extends "legacy/base.html" %} {% block content %} <div class="center"> <h1>{{ _('Page not found') }}</h1> diff --git a/searx/templates/default/about.html b/searx/templates/legacy/about.html index f21a6f296..45fb0e449 100644 --- a/searx/templates/default/about.html +++ b/searx/templates/legacy/about.html @@ -1,6 +1,6 @@ -{% extends 'default/base.html' %} +{% extends 'legacy/base.html' %} {% block content %} -{% include 'default/github_ribbon.html' %} +{% include 'legacy/github_ribbon.html' %} <div class="row"{% if rtl %} dir="ltr"{% endif %}> <h1>About <a href="{{ url_for('index') }}">searx</a></h1> diff --git a/searx/templates/default/base.html b/searx/templates/legacy/base.html index a2c38fef7..a2c38fef7 100644 --- a/searx/templates/default/base.html +++ b/searx/templates/legacy/base.html diff --git a/searx/templates/default/categories.html b/searx/templates/legacy/categories.html index 1c466781b..1c466781b 100644 --- a/searx/templates/default/categories.html +++ b/searx/templates/legacy/categories.html diff --git a/searx/templates/default/github_ribbon.html b/searx/templates/legacy/github_ribbon.html index bdd9cf180..bdd9cf180 100644 --- a/searx/templates/default/github_ribbon.html +++ b/searx/templates/legacy/github_ribbon.html diff --git a/searx/templates/default/index.html b/searx/templates/legacy/index.html index fc15a44b6..de956d5b3 100644 --- a/searx/templates/default/index.html +++ b/searx/templates/legacy/index.html @@ -1,8 +1,8 @@ -{% extends "default/base.html" %} +{% extends "legacy/base.html" %} {% block content %} <div class="center"> <div class="title"><h1>searx</h1></div> - {% include 'default/search.html' %} + {% include 'legacy/search.html' %} <p class="top_margin"> {% if rtl %} <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a> @@ -13,6 +13,6 @@ {% endif %} </p> </div> -{% include 'default/github_ribbon.html' %} +{% include 'legacy/github_ribbon.html' %} {% endblock %} diff --git a/searx/templates/default/infobox.html b/searx/templates/legacy/infobox.html index 4dd25fabd..4dd25fabd 100644 --- a/searx/templates/default/infobox.html +++ b/searx/templates/legacy/infobox.html diff --git a/searx/templates/default/opensearch.xml b/searx/templates/legacy/opensearch.xml index 15d3eb792..15d3eb792 100644 --- a/searx/templates/default/opensearch.xml +++ b/searx/templates/legacy/opensearch.xml diff --git a/searx/templates/default/opensearch_response_rss.xml b/searx/templates/legacy/opensearch_response_rss.xml index 5673eb2e1..5673eb2e1 100644 --- a/searx/templates/default/opensearch_response_rss.xml +++ b/searx/templates/legacy/opensearch_response_rss.xml diff --git a/searx/templates/default/preferences.html b/searx/templates/legacy/preferences.html index 1de9d2275..30d632c93 100644 --- a/searx/templates/default/preferences.html +++ b/searx/templates/legacy/preferences.html @@ -1,4 +1,4 @@ -{% extends "default/base.html" %} +{% extends "legacy/base.html" %} {% block head %} {% endblock %} {% block content %} <div class="row"> @@ -8,7 +8,7 @@ <fieldset> <legend>{{ _('Default categories') }}</legend> {% set display_tooltip = false %} - {% include 'default/categories.html' %} + {% include 'legacy/categories.html' %} </fieldset> <fieldset> <legend>{{ _('Search language') }}</legend> diff --git a/searx/templates/default/result_templates/code.html b/searx/templates/legacy/result_templates/code.html index 9e3ed20af..9e3ed20af 100644 --- a/searx/templates/default/result_templates/code.html +++ b/searx/templates/legacy/result_templates/code.html diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/legacy/result_templates/default.html index da091174d..da091174d 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/legacy/result_templates/default.html diff --git a/searx/templates/default/result_templates/images.html b/searx/templates/legacy/result_templates/images.html index 00f62abcc..00f62abcc 100644 --- a/searx/templates/default/result_templates/images.html +++ b/searx/templates/legacy/result_templates/images.html diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/legacy/result_templates/map.html index 0200e0f6b..0200e0f6b 100644 --- a/searx/templates/default/result_templates/map.html +++ b/searx/templates/legacy/result_templates/map.html diff --git a/searx/templates/default/result_templates/torrent.html b/searx/templates/legacy/result_templates/torrent.html index 67e058ae5..67e058ae5 100644 --- a/searx/templates/default/result_templates/torrent.html +++ b/searx/templates/legacy/result_templates/torrent.html diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/legacy/result_templates/videos.html index 727f44c71..727f44c71 100644 --- a/searx/templates/default/result_templates/videos.html +++ b/searx/templates/legacy/result_templates/videos.html diff --git a/searx/templates/default/results.html b/searx/templates/legacy/results.html index 927b7b8a8..f50700c6f 100644 --- a/searx/templates/default/results.html +++ b/searx/templates/legacy/results.html @@ -1,10 +1,10 @@ -{% extends "default/base.html" %} +{% extends "legacy/base.html" %} {% block title %}{{ q }} - {% endblock %} {% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&format=rss&{% for category in selected_categories %}category_{{ category }}=1&{% endfor %}pageno={{ pageno }}">{% endblock %} {% block content %} <div class="preferences_container right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div> <div class="small search center"> - {% include 'default/search.html' %} + {% include 'legacy/search.html' %} </div> <div id="results"> <div id="sidebar"> @@ -55,16 +55,16 @@ {% if infoboxes %} <div id="infoboxes"> {% for infobox in infoboxes %} - {% include 'default/infobox.html' %} + {% include 'legacy/infobox.html' %} {% endfor %} </div> {% endif %} {% for result in results %} {% if result['template'] %} - {% include get_result_template('default', result['template']) %} + {% include get_result_template('legacy', result['template']) %} {% else %} - {% include 'default/result_templates/default.html' %} + {% include 'legacy/result_templates/default.html' %} {% endif %} {% endfor %} diff --git a/searx/templates/default/search.html b/searx/templates/legacy/search.html index 5a049a492..4d37f9ba1 100644 --- a/searx/templates/default/search.html +++ b/searx/templates/legacy/search.html @@ -4,5 +4,5 @@ <input type="submit" value="search" id="search_submit" /> </div> {% set display_tooltip = true %} - {% include 'default/categories.html' %} + {% include 'legacy/categories.html' %} </form> diff --git a/searx/templates/default/stats.html b/searx/templates/legacy/stats.html index 70fe98ac7..372447e23 100644 --- a/searx/templates/default/stats.html +++ b/searx/templates/legacy/stats.html @@ -1,4 +1,4 @@ -{% extends "default/base.html" %} +{% extends "legacy/base.html" %} {% block head %} {% endblock %} {% block content %} <h2>{{ _('Engine stats') }}</h2> diff --git a/searx/templates/pix-art/preferences.html b/searx/templates/pix-art/preferences.html index a4a6cd268..ea5557b07 100644 --- a/searx/templates/pix-art/preferences.html +++ b/searx/templates/pix-art/preferences.html @@ -1,4 +1,4 @@ -{% extends "default/base.html" %} +{% extends "legacy/base.html" %} {% block head %} {% endblock %} {% block content %} <div class="row"> diff --git a/searx/templates/pix-art/stats.html b/searx/templates/pix-art/stats.html index 70fe98ac7..372447e23 100644 --- a/searx/templates/pix-art/stats.html +++ b/searx/templates/pix-art/stats.html @@ -1,4 +1,4 @@ -{% extends "default/base.html" %} +{% extends "legacy/base.html" %} {% block head %} {% endblock %} {% block content %} <h2>{{ _('Engine stats') }}</h2> diff --git a/tests/robot/test_basic.robot b/tests/robot/test_basic.robot index a455eeaa0..540060fef 100644 --- a/tests/robot/test_basic.robot +++ b/tests/robot/test_basic.robot @@ -67,7 +67,7 @@ Change theme Page Should Contain about Page Should Contain preferences Go To http://localhost:11111/preferences - List Selection Should Be theme default + List Selection Should Be theme legacy Select From List theme oscar Submit Form id=search_form Location Should Be http://localhost:11111/ @@ -139,7 +139,7 @@ Block a plugin Page Should Contain about Page Should Contain preferences Go To http://localhost:11111/preferences - List Selection Should Be theme default + List Selection Should Be theme legacy Select From List theme oscar Submit Form id=search_form Location Should Be http://localhost:11111/ diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py index 1762d66b6..912bebc4d 100644 --- a/tests/unit/test_webapp.py +++ b/tests/unit/test_webapp.py @@ -44,7 +44,7 @@ class ViewsTestCase(SearxTestCase): webapp.Search.search = search_mock def get_current_theme_name_mock(override=None): - return 'default' + return 'legacy' webapp.get_current_theme_name = get_current_theme_name_mock @@ -58,7 +58,7 @@ class ViewsTestCase(SearxTestCase): def test_index_html(self): result = self.app.post('/', data={'q': 'test'}) self.assertIn( - '<h3 class="result_title"><img width="14" height="14" class="favicon" src="/static/themes/default/img/icons/icon_youtube.ico" alt="youtube" /><a href="http://second.test.xyz" rel="noreferrer">Second <span class="highlight">Test</span></a></h3>', # noqa + '<h3 class="result_title"><img width="14" height="14" class="favicon" src="/static/themes/legacy/img/icons/icon_youtube.ico" alt="youtube" /><a href="http://second.test.xyz" rel="noreferrer">Second <span class="highlight">Test</span></a></h3>', # noqa result.data ) self.assertIn( |