Browse Source

[mod] rename "default" theme to "legacy"

Adam Tauber 8 years ago
parent
commit
bee7b497a3
68 changed files with 24 additions and 24 deletions
  1. 2
    2
      manage.sh
  2. 1
    1
      searx/settings_robot.yml
  3. 0
    0
      searx/static/themes/legacy/css/style-rtl.css
  4. 0
    0
      searx/static/themes/legacy/css/style.css
  5. 0
    0
      searx/static/themes/legacy/img/favicon.png
  6. 0
    0
      searx/static/themes/legacy/img/github_ribbon.png
  7. 0
    0
      searx/static/themes/legacy/img/icons/icon_500px.ico
  8. 0
    0
      searx/static/themes/legacy/img/icons/icon_bing.ico
  9. 0
    0
      searx/static/themes/legacy/img/icons/icon_dailymotion.ico
  10. 0
    0
      searx/static/themes/legacy/img/icons/icon_deezer.ico
  11. 0
    0
      searx/static/themes/legacy/img/icons/icon_deviantart.ico
  12. 0
    0
      searx/static/themes/legacy/img/icons/icon_digg.ico
  13. 0
    0
      searx/static/themes/legacy/img/icons/icon_duckduckgo.ico
  14. 0
    0
      searx/static/themes/legacy/img/icons/icon_flickr.ico
  15. 0
    0
      searx/static/themes/legacy/img/icons/icon_github.ico
  16. 0
    0
      searx/static/themes/legacy/img/icons/icon_google play apps.ico
  17. 0
    0
      searx/static/themes/legacy/img/icons/icon_google play movies.ico
  18. 0
    0
      searx/static/themes/legacy/img/icons/icon_google play music.ico
  19. 0
    0
      searx/static/themes/legacy/img/icons/icon_google.ico
  20. 0
    0
      searx/static/themes/legacy/img/icons/icon_kickass.ico
  21. 0
    0
      searx/static/themes/legacy/img/icons/icon_openstreetmap.ico
  22. 0
    0
      searx/static/themes/legacy/img/icons/icon_searchcode code.ico
  23. 0
    0
      searx/static/themes/legacy/img/icons/icon_searchcode doc.ico
  24. 0
    0
      searx/static/themes/legacy/img/icons/icon_searchcode.ico
  25. 0
    0
      searx/static/themes/legacy/img/icons/icon_soundcloud.ico
  26. 0
    0
      searx/static/themes/legacy/img/icons/icon_stackoverflow.ico
  27. 0
    0
      searx/static/themes/legacy/img/icons/icon_startpage.ico
  28. 0
    0
      searx/static/themes/legacy/img/icons/icon_subtitleseeker.ico
  29. 0
    0
      searx/static/themes/legacy/img/icons/icon_twitter.ico
  30. 0
    0
      searx/static/themes/legacy/img/icons/icon_vimeo.ico
  31. 0
    0
      searx/static/themes/legacy/img/icons/icon_wikipedia.ico
  32. 0
    0
      searx/static/themes/legacy/img/icons/icon_yahoo.ico
  33. 0
    0
      searx/static/themes/legacy/img/icons/icon_youtube.ico
  34. 0
    0
      searx/static/themes/legacy/img/preference-icon.png
  35. 0
    0
      searx/static/themes/legacy/img/search-icon.png
  36. 0
    0
      searx/static/themes/legacy/img/searx.png
  37. 0
    0
      searx/static/themes/legacy/img/searx_logo.svg
  38. 0
    0
      searx/static/themes/legacy/js/searx.js
  39. 0
    0
      searx/static/themes/legacy/less/autocompleter.less
  40. 0
    0
      searx/static/themes/legacy/less/code.less
  41. 0
    0
      searx/static/themes/legacy/less/definitions.less
  42. 0
    0
      searx/static/themes/legacy/less/mixins.less
  43. 0
    0
      searx/static/themes/legacy/less/search.less
  44. 0
    0
      searx/static/themes/legacy/less/style-rtl.less
  45. 0
    0
      searx/static/themes/legacy/less/style.less
  46. 1
    1
      searx/templates/legacy/404.html
  47. 2
    2
      searx/templates/legacy/about.html
  48. 0
    0
      searx/templates/legacy/base.html
  49. 0
    0
      searx/templates/legacy/categories.html
  50. 0
    0
      searx/templates/legacy/github_ribbon.html
  51. 3
    3
      searx/templates/legacy/index.html
  52. 0
    0
      searx/templates/legacy/infobox.html
  53. 0
    0
      searx/templates/legacy/opensearch.xml
  54. 0
    0
      searx/templates/legacy/opensearch_response_rss.xml
  55. 2
    2
      searx/templates/legacy/preferences.html
  56. 0
    0
      searx/templates/legacy/result_templates/code.html
  57. 0
    0
      searx/templates/legacy/result_templates/default.html
  58. 0
    0
      searx/templates/legacy/result_templates/images.html
  59. 0
    0
      searx/templates/legacy/result_templates/map.html
  60. 0
    0
      searx/templates/legacy/result_templates/torrent.html
  61. 0
    0
      searx/templates/legacy/result_templates/videos.html
  62. 5
    5
      searx/templates/legacy/results.html
  63. 1
    1
      searx/templates/legacy/search.html
  64. 1
    1
      searx/templates/legacy/stats.html
  65. 1
    1
      searx/templates/pix-art/preferences.html
  66. 1
    1
      searx/templates/pix-art/stats.html
  67. 2
    2
      tests/robot/test_basic.robot
  68. 2
    2
      tests/unit/test_webapp.py

+ 2
- 2
manage.sh View File

53
 
53
 
54
 styles() {
54
 styles() {
55
     echo '[!] Building styles'
55
     echo '[!] Building styles'
56
-	build_style themes/default/less/style.less themes/default/css/style.css
57
-	build_style themes/default/less/style-rtl.less themes/default/css/style-rtl.css
56
+	build_style themes/legacy/less/style.less themes/legacy/css/style.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

+ 1
- 1
searx/settings_robot.yml View File

15
 
15
 
16
 ui:
16
 ui:
17
     themes_path : ""
17
     themes_path : ""
18
-    default_theme : default
18
+    default_theme : legacy
19
     default_locale : ""
19
     default_locale : ""
20
 
20
 
21
 outgoing:
21
 outgoing:

searx/static/themes/default/css/style-rtl.css → searx/static/themes/legacy/css/style-rtl.css View File


searx/static/themes/default/css/style.css → searx/static/themes/legacy/css/style.css View File


searx/static/themes/default/img/favicon.png → searx/static/themes/legacy/img/favicon.png View File


searx/static/themes/default/img/github_ribbon.png → searx/static/themes/legacy/img/github_ribbon.png View File


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


searx/static/themes/default/img/searx.png → searx/static/themes/legacy/img/searx.png View File


searx/static/themes/default/img/searx_logo.svg → searx/static/themes/legacy/img/searx_logo.svg View File


searx/static/themes/default/js/searx.js → searx/static/themes/legacy/js/searx.js View File


searx/static/themes/default/less/autocompleter.less → searx/static/themes/legacy/less/autocompleter.less View File


searx/static/themes/default/less/code.less → searx/static/themes/legacy/less/code.less View File


searx/static/themes/default/less/definitions.less → searx/static/themes/legacy/less/definitions.less View File


searx/static/themes/default/less/mixins.less → searx/static/themes/legacy/less/mixins.less View File


searx/static/themes/default/less/search.less → searx/static/themes/legacy/less/search.less View File


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


searx/static/themes/default/less/style.less → searx/static/themes/legacy/less/style.less View File


searx/templates/default/404.html → searx/templates/legacy/404.html View File

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.html View File

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.html View File


searx/templates/default/categories.html → searx/templates/legacy/categories.html View File


searx/templates/default/github_ribbon.html → searx/templates/legacy/github_ribbon.html View File


searx/templates/default/index.html → searx/templates/legacy/index.html View File

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
         {% 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.html View File


searx/templates/default/opensearch.xml → searx/templates/legacy/opensearch.xml View File


searx/templates/default/opensearch_response_rss.xml → searx/templates/legacy/opensearch_response_rss.xml View File


searx/templates/default/preferences.html → searx/templates/legacy/preferences.html View File

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
     <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.html View File


searx/templates/default/result_templates/default.html → searx/templates/legacy/result_templates/default.html View File


searx/templates/default/result_templates/images.html → searx/templates/legacy/result_templates/images.html View File


searx/templates/default/result_templates/map.html → searx/templates/legacy/result_templates/map.html View File


searx/templates/default/result_templates/torrent.html → searx/templates/legacy/result_templates/torrent.html View File


searx/templates/default/result_templates/videos.html → searx/templates/legacy/result_templates/videos.html View File


searx/templates/default/results.html → searx/templates/legacy/results.html View File

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
     {% 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.html View File

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.html View File

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>

+ 1
- 1
searx/templates/pix-art/preferences.html View File

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">

+ 1
- 1
searx/templates/pix-art/stats.html View File

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>

+ 2
- 2
tests/robot/test_basic.robot View File

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
     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/

+ 2
- 2
tests/unit/test_webapp.py View File

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
     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(