git.iko.soy/searx
on master help sign in
[mod] rename "default" theme to "legacy"
bee7b49Adam Tauber
manage.sh+2−2
compare with master
unifiedsplit
@@ -53,8 +53,8 @@ build_style() {
53
53
54styles() {
54styles() {
55 echo '[!] Building styles'
55 echo '[!] Building styles'
56− build_style themes/default/less/style.less themes/default/css/style.css
56+ build_style themes/legacy/less/style.less themes/legacy/css/style.css
57− build_style themes/default/less/style-rtl.less themes/default/css/style-rtl.css
57+ build_style themes/legacy/less/style-rtl.less themes/legacy/css/style-rtl.css
58 build_style themes/courgette/less/style.less themes/courgette/css/style.css
58 build_style themes/courgette/less/style.less themes/courgette/css/style.css
59 build_style themes/courgette/less/style-rtl.less themes/courgette/css/style-rtl.css
59 build_style themes/courgette/less/style-rtl.less themes/courgette/css/style-rtl.css
60 build_style less/bootstrap/bootstrap.less css/bootstrap.min.css
60 build_style less/bootstrap/bootstrap.less css/bootstrap.min.css
searx/settings_robot.yml+1−1
@@ -15,7 +15,7 @@ server:
15
15
16ui:
16ui:
17 themes_path : ""
17 themes_path : ""
18− default_theme : default
18+ default_theme : legacy
19 default_locale : ""
19 default_locale : ""
20
20
21outgoing:
21outgoing:
searx/static/themes/default/css/style-rtl.css → searx/static/themes/legacy/css/style-rtl.cssrenamed

The content is the same.

searx/static/themes/default/css/style.css → searx/static/themes/legacy/css/style.cssrenamed

The content is the same.

searx/static/themes/default/img/favicon.png → searx/static/themes/legacy/img/favicon.pngrenamed

Binary file not shown.

searx/static/themes/default/img/github_ribbon.png → searx/static/themes/legacy/img/github_ribbon.pngrenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_500px.ico → searx/static/themes/legacy/img/icons/icon_500px.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_bing.ico → searx/static/themes/legacy/img/icons/icon_bing.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_dailymotion.ico → searx/static/themes/legacy/img/icons/icon_dailymotion.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_deezer.ico → searx/static/themes/legacy/img/icons/icon_deezer.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_deviantart.ico → searx/static/themes/legacy/img/icons/icon_deviantart.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_digg.ico → searx/static/themes/legacy/img/icons/icon_digg.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_duckduckgo.ico → searx/static/themes/legacy/img/icons/icon_duckduckgo.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_flickr.ico → searx/static/themes/legacy/img/icons/icon_flickr.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_github.ico → searx/static/themes/legacy/img/icons/icon_github.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_google play apps.ico → searx/static/themes/legacy/img/icons/icon_google play apps.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_google play movies.ico → searx/static/themes/legacy/img/icons/icon_google play movies.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_google play music.ico → searx/static/themes/legacy/img/icons/icon_google play music.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_google.ico → searx/static/themes/legacy/img/icons/icon_google.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_kickass.ico → searx/static/themes/legacy/img/icons/icon_kickass.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_openstreetmap.ico → searx/static/themes/legacy/img/icons/icon_openstreetmap.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_searchcode code.ico → searx/static/themes/legacy/img/icons/icon_searchcode code.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_searchcode doc.ico → searx/static/themes/legacy/img/icons/icon_searchcode doc.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_searchcode.ico → searx/static/themes/legacy/img/icons/icon_searchcode.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_soundcloud.ico → searx/static/themes/legacy/img/icons/icon_soundcloud.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_stackoverflow.ico → searx/static/themes/legacy/img/icons/icon_stackoverflow.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_startpage.ico → searx/static/themes/legacy/img/icons/icon_startpage.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_subtitleseeker.ico → searx/static/themes/legacy/img/icons/icon_subtitleseeker.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_twitter.ico → searx/static/themes/legacy/img/icons/icon_twitter.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_vimeo.ico → searx/static/themes/legacy/img/icons/icon_vimeo.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_wikipedia.ico → searx/static/themes/legacy/img/icons/icon_wikipedia.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_yahoo.ico → searx/static/themes/legacy/img/icons/icon_yahoo.icorenamed

Binary file not shown.

searx/static/themes/default/img/icons/icon_youtube.ico → searx/static/themes/legacy/img/icons/icon_youtube.icorenamed

Binary file not shown.

searx/static/themes/default/img/preference-icon.png → searx/static/themes/legacy/img/preference-icon.pngrenamed

Binary file not shown.

searx/static/themes/default/img/search-icon.png → searx/static/themes/legacy/img/search-icon.pngrenamed

Binary file not shown.

searx/static/themes/default/img/searx.png → searx/static/themes/legacy/img/searx.pngrenamed

Binary file not shown.

searx/static/themes/default/img/searx_logo.svg → searx/static/themes/legacy/img/searx_logo.svgrenamed

The content is the same.

searx/static/themes/default/js/searx.js → searx/static/themes/legacy/js/searx.jsrenamed

The content is the same.

searx/static/themes/default/less/autocompleter.less → searx/static/themes/legacy/less/autocompleter.lessrenamed

The content is the same.

searx/static/themes/default/less/code.less → searx/static/themes/legacy/less/code.lessrenamed

The content is the same.

searx/static/themes/default/less/definitions.less → searx/static/themes/legacy/less/definitions.lessrenamed

The content is the same.

searx/static/themes/default/less/mixins.less → searx/static/themes/legacy/less/mixins.lessrenamed

The content is the same.

searx/static/themes/default/less/search.less → searx/static/themes/legacy/less/search.lessrenamed

The content is the same.

searx/static/themes/default/less/style-rtl.less → searx/static/themes/legacy/less/style-rtl.lessrenamed

The content is the same.

searx/static/themes/default/less/style.less → searx/static/themes/legacy/less/style.lessrenamed

The content is the same.

searx/templates/default/404.html → searx/templates/legacy/404.htmlrenamed+1−1
@@ -1,4 +1,4 @@
1−{% extends "default/base.html" %}
1+{% extends "legacy/base.html" %}
2{% block content %}
2{% block content %}
3<div class="center">
3<div class="center">
4 <h1>{{ _('Page not found') }}</h1>
4 <h1>{{ _('Page not found') }}</h1>
searx/templates/default/about.html → searx/templates/legacy/about.htmlrenamed+2−2
@@ -1,6 +1,6 @@
1−{% extends 'default/base.html' %}
1+{% extends 'legacy/base.html' %}
2{% block content %}
2{% block content %}
3−{% include 'default/github_ribbon.html' %}
3+{% include 'legacy/github_ribbon.html' %}
4<div class="row"{% if rtl %} dir="ltr"{% endif %}>
4<div class="row"{% if rtl %} dir="ltr"{% endif %}>
5 <h1>About <a href="{{ url_for('index') }}">searx</a></h1>
5 <h1>About <a href="{{ url_for('index') }}">searx</a></h1>
6
6
searx/templates/default/base.html → searx/templates/legacy/base.htmlrenamed

The content is the same.

searx/templates/default/categories.html → searx/templates/legacy/categories.htmlrenamed

The content is the same.

searx/templates/default/github_ribbon.html → searx/templates/legacy/github_ribbon.htmlrenamed

The content is the same.

searx/templates/default/index.html → searx/templates/legacy/index.htmlrenamed+3−3
@@ -1,8 +1,8 @@
1−{% extends "default/base.html" %}
1+{% extends "legacy/base.html" %}
2{% block content %}
2{% block content %}
3<div class="center">
3<div class="center">
4 <div class="title"><h1>searx</h1></div>
4 <div class="title"><h1>searx</h1></div>
5− {% include 'default/search.html' %}
5+ {% include 'legacy/search.html' %}
6 <p class="top_margin">
6 <p class="top_margin">
7 {% if rtl %}
7 {% if rtl %}
8 <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a>
8 <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a>
@@ -13,6 +13,6 @@
13 {% endif %}
13 {% endif %}
14 </p>
14 </p>
15</div>
15</div>
16−{% include 'default/github_ribbon.html' %}
16+{% include 'legacy/github_ribbon.html' %}
17{% endblock %}
17{% endblock %}
18
18
searx/templates/default/infobox.html → searx/templates/legacy/infobox.htmlrenamed

The content is the same.

searx/templates/default/opensearch.xml → searx/templates/legacy/opensearch.xmlrenamed

The content is the same.

searx/templates/default/opensearch_response_rss.xml → searx/templates/legacy/opensearch_response_rss.xmlrenamed

The content is the same.

searx/templates/default/preferences.html → searx/templates/legacy/preferences.htmlrenamed+2−2
@@ -1,4 +1,4 @@
1−{% extends "default/base.html" %}
1+{% extends "legacy/base.html" %}
2{% block head %} {% endblock %}
2{% block head %} {% endblock %}
3{% block content %}
3{% block content %}
4<div class="row">
4<div class="row">
@@ -8,7 +8,7 @@
8 <fieldset>
8 <fieldset>
9 <legend>{{ _('Default categories') }}</legend>
9 <legend>{{ _('Default categories') }}</legend>
10 {% set display_tooltip = false %}
10 {% set display_tooltip = false %}
11− {% include 'default/categories.html' %}
11+ {% include 'legacy/categories.html' %}
12 </fieldset>
12 </fieldset>
13 <fieldset>
13 <fieldset>
14 <legend>{{ _('Search language') }}</legend>
14 <legend>{{ _('Search language') }}</legend>
searx/templates/default/result_templates/code.html → searx/templates/legacy/result_templates/code.htmlrenamed

The content is the same.

searx/templates/default/result_templates/default.html → searx/templates/legacy/result_templates/default.htmlrenamed

The content is the same.

searx/templates/default/result_templates/images.html → searx/templates/legacy/result_templates/images.htmlrenamed

The content is the same.

searx/templates/default/result_templates/map.html → searx/templates/legacy/result_templates/map.htmlrenamed

The content is the same.

searx/templates/default/result_templates/torrent.html → searx/templates/legacy/result_templates/torrent.htmlrenamed

The content is the same.

searx/templates/default/result_templates/videos.html → searx/templates/legacy/result_templates/videos.htmlrenamed

The content is the same.

searx/templates/default/results.html → searx/templates/legacy/results.htmlrenamed+5−5
@@ -1,10 +1,10 @@
1−{% extends "default/base.html" %}
1+{% extends "legacy/base.html" %}
2{% block title %}{{ q }} - {% endblock %}
2{% block title %}{{ q }} - {% endblock %}
3{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&amp;format=rss&amp;{% for category in selected_categories %}category_{{ category }}=1&amp;{% endfor %}pageno={{ pageno }}">{% endblock %}
3{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&amp;format=rss&amp;{% for category in selected_categories %}category_{{ category }}=1&amp;{% endfor %}pageno={{ pageno }}">{% endblock %}
4{% block content %}
4{% block content %}
5<div class="preferences_container right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div>
5<div class="preferences_container right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div>
6<div class="small search center">
6<div class="small search center">
7− {% include 'default/search.html' %}
7+ {% include 'legacy/search.html' %}
8</div>
8</div>
9<div id="results">
9<div id="results">
10 <div id="sidebar">
10 <div id="sidebar">
@@ -55,16 +55,16 @@
55 {% if infoboxes %}
55 {% if infoboxes %}
56 <div id="infoboxes">
56 <div id="infoboxes">
57 {% for infobox in infoboxes %}
57 {% for infobox in infoboxes %}
58− {% include 'default/infobox.html' %}
58+ {% include 'legacy/infobox.html' %}
59 {% endfor %}
59 {% endfor %}
60 </div>
60 </div>
61 {% endif %}
61 {% endif %}
62
62
63 {% for result in results %}
63 {% for result in results %}
64 {% if result['template'] %}
64 {% if result['template'] %}
65− {% include get_result_template('default', result['template']) %}
65+ {% include get_result_template('legacy', result['template']) %}
66 {% else %}
66 {% else %}
67− {% include 'default/result_templates/default.html' %}
67+ {% include 'legacy/result_templates/default.html' %}
68 {% endif %}
68 {% endif %}
69 {% endfor %}
69 {% endfor %}
70
70
searx/templates/default/search.html → searx/templates/legacy/search.htmlrenamed+1−1
@@ -4,5 +4,5 @@
4 <input type="submit" value="search" id="search_submit" />
4 <input type="submit" value="search" id="search_submit" />
5 </div>
5 </div>
6 {% set display_tooltip = true %}
6 {% set display_tooltip = true %}
7− {% include 'default/categories.html' %}
7+ {% include 'legacy/categories.html' %}
8</form>
8</form>
searx/templates/default/stats.html → searx/templates/legacy/stats.htmlrenamed+1−1
@@ -1,4 +1,4 @@
1−{% extends "default/base.html" %}
1+{% extends "legacy/base.html" %}
2{% block head %} {% endblock %}
2{% block head %} {% endblock %}
3{% block content %}
3{% block content %}
4<h2>{{ _('Engine stats') }}</h2>
4<h2>{{ _('Engine stats') }}</h2>
searx/templates/pix-art/preferences.html+1−1
@@ -1,4 +1,4 @@
1−{% extends "default/base.html" %}
1+{% extends "legacy/base.html" %}
2{% block head %} {% endblock %}
2{% block head %} {% endblock %}
3{% block content %}
3{% block content %}
4<div class="row">
4<div class="row">
searx/templates/pix-art/stats.html+1−1
@@ -1,4 +1,4 @@
1−{% extends "default/base.html" %}
1+{% extends "legacy/base.html" %}
2{% block head %} {% endblock %}
2{% block head %} {% endblock %}
3{% block content %}
3{% block content %}
4<h2>{{ _('Engine stats') }}</h2>
4<h2>{{ _('Engine stats') }}</h2>
tests/robot/test_basic.robot+2−2
@@ -67,7 +67,7 @@ Change theme
67 Page Should Contain about
67 Page Should Contain about
68 Page Should Contain preferences
68 Page Should Contain preferences
69 Go To http://localhost:11111/preferences
69 Go To http://localhost:11111/preferences
70− List Selection Should Be theme default
70+ List Selection Should Be theme legacy
71 Select From List theme oscar
71 Select From List theme oscar
72 Submit Form id=search_form
72 Submit Form id=search_form
73 Location Should Be http://localhost:11111/
73 Location Should Be http://localhost:11111/
@@ -139,7 +139,7 @@ Block a plugin
139 Page Should Contain about
139 Page Should Contain about
140 Page Should Contain preferences
140 Page Should Contain preferences
141 Go To http://localhost:11111/preferences
141 Go To http://localhost:11111/preferences
142− List Selection Should Be theme default
142+ List Selection Should Be theme legacy
143 Select From List theme oscar
143 Select From List theme oscar
144 Submit Form id=search_form
144 Submit Form id=search_form
145 Location Should Be http://localhost:11111/
145 Location Should Be http://localhost:11111/
tests/unit/test_webapp.py+2−2
@@ -44,7 +44,7 @@ class ViewsTestCase(SearxTestCase):
44 webapp.Search.search = search_mock
44 webapp.Search.search = search_mock
45
45
46 def get_current_theme_name_mock(override=None):
46 def get_current_theme_name_mock(override=None):
47− return 'default'
47+ return 'legacy'
48
48
49 webapp.get_current_theme_name = get_current_theme_name_mock
49 webapp.get_current_theme_name = get_current_theme_name_mock
50
50
@@ -58,7 +58,7 @@ class ViewsTestCase(SearxTestCase):
58 def test_index_html(self):
58 def test_index_html(self):
59 result = self.app.post('/', data={'q': 'test'})
59 result = self.app.post('/', data={'q': 'test'})
60 self.assertIn(
60 self.assertIn(
61− '<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
61+ '<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
62 result.data
62 result.data
63 )
63 )
64 self.assertIn(
64 self.assertIn(