git.iko.soy/searx
on master help sign in
Merge pull request #1031 from misnyo/static_path

[fix] static path fixed in templates and webapp, line endings fixed

commit9804ab7a1bd6dd4b7abca06e016b08c94cde4514 authorAdam Tauber <asciimoo@gmail.com> dateFri 8 Sep 2017, 20:46 (9 years ago) parentf4df27fae99f90
5 files changed+112−113
compare with master
unifiedsplit
searx/templates/courgette/result_templates/code.html+11−11 searx/templates/legacy/result_templates/code.html+11−11 searx/templates/oscar/macros.html+87−88 searx/templates/simple/macros.html+1−2 searx/webapp.py+2−1
searx/templates/courgette/result_templates/code.html+11−11
@@ -1,11 +1,11 @@
1−<div class="result {{ result.class }}">
2− <h3 class="result_title">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>
3− {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
4− <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
5− {% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.repository }}</a></p>{% endif %}
6− <div dir="ltr">
7− {{ result.codelines|code_highlighter(result.code_language)|safe }}
8− </div>
9−
10− <p class="url">{{ result.pretty_url }}&lrm;</p>
11−</div>
1+<div class="result {{ result.class }}">
2+ <h3 class="result_title"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>
3+ {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
4+ <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
5+ {% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.repository }}</a></p>{% endif %}
6+ <div dir="ltr">
7+ {{ result.codelines|code_highlighter(result.code_language)|safe }}
8+ </div>
9+
10+ <p class="url">{{ result.pretty_url }}&lrm;</p>
11+</div>
searx/templates/legacy/result_templates/code.html+11−11
@@ -1,11 +1,11 @@
1−<div class="result {{ result.class }}">
2− <h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>
3− <p class="url">{{ result.pretty_url }}&lrm; <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ _('cached') }}</a></p>
4− {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
5− <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
6− {% if result.repository %}<p class="result-content"><a href="{{ result.repository|safe }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.repository }}</a></p>{% endif %}
7−
8− <div dir="ltr">
9− {{ result.codelines|code_highlighter(result.code_language)|safe }}
10− </div>
11−</div>
1+<div class="result {{ result.class }}">
2+ <h3 class="result_title"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>
3+ <p class="url">{{ result.pretty_url }}&lrm; <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ _('cached') }}</a></p>
4+ {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
5+ <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
6+ {% if result.repository %}<p class="result-content"><a href="{{ result.repository|safe }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.repository }}</a></p>{% endif %}
7+
8+ <div dir="ltr">
9+ {{ result.codelines|code_highlighter(result.code_language)|safe }}
10+ </div>
11+</div>
searx/templates/oscar/macros.html+87−88
@@ -1,88 +1,87 @@
1−<!-- Draw glyphicon icon from bootstrap-theme -->
2−{% macro icon(action) -%}
3− <span class="glyphicon glyphicon-{{ action }}"></span>
4−{%- endmacro %}
5−
6−<!-- Draw favicon -->
7−<!-- TODO: using url_for methode -->
8−{% macro draw_favicon(favicon) -%}
9− <img width="32" height="32" class="favicon" src="static/themes/oscar/img/icons/{{ favicon }}.png" alt="{{ favicon }}" />
10−{%- endmacro %}
11−
12−{%- macro result_link(url, title, classes='') -%}
13−<a href="{{ url }}" {% if classes %}class="{{ classes }}" {% endif %}{% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ title }}</a>
14−{%- endmacro -%}
15−
16−<!-- Draw result header -->
17−{% macro result_header(result, favicons) -%}
18−<h4 class="result_header">{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{{ result_link(result.url, result.title|safe) }}</h4>
19−{%- endmacro %}
20−
21−<!-- Draw result sub header -->
22−{% macro result_sub_header(result) -%}
23− {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}
24− {% if result.magnetlink %}<small> &bull; {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink") }}</small>{% endif %}
25− {% if result.torrentfile %}<small> &bull; {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile") }}</small>{% endif %}
26−{%- endmacro %}
27−
28−<!-- Draw result footer -->
29−{% macro result_footer(result) -%}
30− <div class="clearfix"></div>
31− <div class="pull-right">
32− {% for engine in result.engines %}
33− <span class="label label-default">{{ engine }}</span>
34− {% endfor %}
35− <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}</small>
36− {% if proxify %}
37− <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>
38− {% endif %}
39−</div>
40−<div class="external-link">{{ result.pretty_url }}</div>
41−{%- endmacro %}
42−
43−<!-- Draw result footer -->
44−{% macro result_footer_rtl(result) -%}
45− <div class="clearfix"></div>
46− {% for engine in result.engines %}
47− <span class="label label-default">{{ engine }}</span>
48− {% endfor %}
49− <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}</small>
50− {% if proxify %}
51− <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>
52− {% endif %}
53− <div class="external-link">{{ result.pretty_url }}</div>
54−{%- endmacro %}
55−
56−{% macro preferences_item_header(info, label, rtl) -%}
57− {% if rtl %}
58− <div class="row form-group">
59− <label class="col-sm-3 col-md-2 pull-right">{{ label }}</label>
60− <span class="col-sm-5 col-md-6 help-block pull-left">{{ info }}</span>
61− <div class="col-sm-4 col-md-4">
62− {% else %}
63− <div class="row form-group">
64− <label class="col-sm-3 col-md-2">{{ label }}</label>
65− <div class="col-sm-4 col-md-4">
66− {% endif %}
67−{%- endmacro %}
68−
69−{% macro preferences_item_footer(info, label, rtl) -%}
70− {% if rtl %}
71− </div>
72− </div>
73− {% else %}
74− </div>
75− <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>
76− </div>
77− {% endif %}
78−{%- endmacro %}
79−
80−{% macro checkbox_toggle(id, blocked) -%}
81− <div class="onoffswitch">
82− <input type="checkbox" id="{{ id }}" name="{{ id }}"{% if blocked %} checked="checked"{% endif %} class="onoffswitch-checkbox">
83− <label class="onoffswitch-label" for="{{ id }}">
84− <span class="onoffswitch-inner"></span>
85− <span class="onoffswitch-switch"></span>
86− </label>
87− </div>
88−{%- endmacro %}
1+<!-- Draw glyphicon icon from bootstrap-theme -->
2+{% macro icon(action) -%}
3+ <span class="glyphicon glyphicon-{{ action }}"></span>
4+{%- endmacro %}
5+
6+<!-- Draw favicon -->
7+{% macro draw_favicon(favicon) -%}
8+ <img width="32" height="32" class="favicon" src="{{ url_for('static', filename='/themes/oscar/img/icons/' + favicon + '.png') }}" alt="{{ favicon }}" />
9+{%- endmacro %}
10+
11+{%- macro result_link(url, title, classes='') -%}
12+<a href="{{ url }}" {% if classes %}class="{{ classes }}" {% endif %}{% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ title }}</a>
13+{%- endmacro -%}
14+
15+<!-- Draw result header -->
16+{% macro result_header(result, favicons) -%}
17+<h4 class="result_header">{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{{ result_link(result.url, result.title|safe) }}</h4>
18+{%- endmacro %}
19+
20+<!-- Draw result sub header -->
21+{% macro result_sub_header(result) -%}
22+ {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}
23+ {% if result.magnetlink %}<small> &bull; {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink") }}</small>{% endif %}
24+ {% if result.torrentfile %}<small> &bull; {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile") }}</small>{% endif %}
25+{%- endmacro %}
26+
27+<!-- Draw result footer -->
28+{% macro result_footer(result) -%}
29+ <div class="clearfix"></div>
30+ <div class="pull-right">
31+ {% for engine in result.engines %}
32+ <span class="label label-default">{{ engine }}</span>
33+ {% endfor %}
34+ <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}</small>
35+ {% if proxify %}
36+ <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>
37+ {% endif %}
38+</div>
39+<div class="external-link">{{ result.pretty_url }}</div>
40+{%- endmacro %}
41+
42+<!-- Draw result footer -->
43+{% macro result_footer_rtl(result) -%}
44+ <div class="clearfix"></div>
45+ {% for engine in result.engines %}
46+ <span class="label label-default">{{ engine }}</span>
47+ {% endfor %}
48+ <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}</small>
49+ {% if proxify %}
50+ <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>
51+ {% endif %}
52+ <div class="external-link">{{ result.pretty_url }}</div>
53+{%- endmacro %}
54+
55+{% macro preferences_item_header(info, label, rtl) -%}
56+ {% if rtl %}
57+ <div class="row form-group">
58+ <label class="col-sm-3 col-md-2 pull-right">{{ label }}</label>
59+ <span class="col-sm-5 col-md-6 help-block pull-left">{{ info }}</span>
60+ <div class="col-sm-4 col-md-4">
61+ {% else %}
62+ <div class="row form-group">
63+ <label class="col-sm-3 col-md-2">{{ label }}</label>
64+ <div class="col-sm-4 col-md-4">
65+ {% endif %}
66+{%- endmacro %}
67+
68+{% macro preferences_item_footer(info, label, rtl) -%}
69+ {% if rtl %}
70+ </div>
71+ </div>
72+ {% else %}
73+ </div>
74+ <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>
75+ </div>
76+ {% endif %}
77+{%- endmacro %}
78+
79+{% macro checkbox_toggle(id, blocked) -%}
80+ <div class="onoffswitch">
81+ <input type="checkbox" id="{{ id }}" name="{{ id }}"{% if blocked %} checked="checked"{% endif %} class="onoffswitch-checkbox">
82+ <label class="onoffswitch-label" for="{{ id }}">
83+ <span class="onoffswitch-inner"></span>
84+ <span class="onoffswitch-switch"></span>
85+ </label>
86+ </div>
87+{%- endmacro %}
searx/templates/simple/macros.html+1−2
@@ -8,9 +8,8 @@
88{%- endmacro %}
99
1010<!-- Draw favicon -->
11−<!-- TODO: using url_for methode -->
1211{% macro draw_favicon(favicon) -%}
13− <img width="14" height="14" class="favicon" src="static/themes/simple/img/icons/{{ favicon }}.png" alt="{{ favicon }}" />
12+ <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='/themes/simple/img/icons/' + favicon + '.png') }}" alt="{{ favicon }}" />
1413{%- endmacro %}
1514
1615{% macro result_open_link(url, classes='') -%}
searx/webapp.py+2−1
@@ -792,7 +792,8 @@ def opensearch():
792792@app.route('/favicon.ico')
793793def favicon():
794794 return send_from_directory(os.path.join(app.root_path,
795− 'static/themes',
795+ static_path,
796+ 'themes',
796797 get_current_theme_name(),
797798 'img'),
798799 'favicon.png',