798bef7 · searx · git.iko.soy

searx/templates/courgette/result_templates/default.html+1−1

compare with master

unifiedsplit

@@ -1,7 +1,7 @@

1<div class="result {{ result.class }}">

2

3 {% if "icon_"~result.engine~".ico" in favicons %}

4− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />

4+ <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />

5 {% endif %}

6

7 <div>

searx/templates/default/result_templates/default.html+1−1

@@ -1,5 +1,5 @@

1<div class="result {{ result.class }}">

2− <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

2+ <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

3 <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">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="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>

searx/templates/oscar/result_templates/default.html+1−1

@@ -1,6 +1,6 @@

1{% from 'oscar/macros.html' import icon %}

2

3−<h4 class="result_header">{% if result.engine~".png" in favicons %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result.engine }}.png" alt="{{ result.engine }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>

3+<h4 class="result_header">{% if result.engine~".png" in favicons %}<img width="32" height="32" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{ result.engine }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>

4

5{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}

6<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>

searx/tests/test_webapp.py+1−1

@@ -49,7 +49,7 @@ class ViewsTestCase(SearxTestCase):

49 )

50 result = self.app.post('/', data={'q': 'test'})

51 self.assertIn(

52− '<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">Second <span class="highlight">Test</span></a></h3>', # noqa

52+ '<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">Second <span class="highlight">Test</span></a></h3>', # noqa

53 result.data

54 )

55 self.assertIn(

searx/webapp.py+2−2

@@ -73,7 +73,7 @@ babel = Babel(app)

73global_favicons = []

74for indice, theme in enumerate(themes):

75 global_favicons.append([])

76− theme_img_path = searx_dir+"/static/"+theme+"/img/icons/"

76+ theme_img_path = searx_dir+"/static/themes/"+theme+"/img/icons/"

77 for (dirpath, dirnames, filenames) in os.walk(theme_img_path):

78 global_favicons[indice].extend(filenames)

79

@@ -506,7 +506,7 @@ def opensearch():

506@app.route('/favicon.ico')

507def favicon():

508 return send_from_directory(os.path.join(app.root_path,

509− 'static',

509+ 'static/themes',

510 get_current_theme_name(),

511 'img'),

512 'favicon.png',