f5aec98 · searx · git.iko.soy

git.iko.soy/searx

Merge pull request #145 from Cqoicebordel/HTML+Bugs-Templates

Html+Bugs in templates

commitf5aec98cbd023a63ffd6bbee1c18134036b3a7bc authorAdam Tauber <asciimoo@gmail.com> dateSat 13 Dec 2014, 23:27 (12 years ago) parent2cfa760 b2f5f65

13 files changed+19−23

compare with master

unifiedsplit

searx/templates/courgette/result_templates/default.html+1−1 searx/templates/courgette/result_templates/images.html+1−1 searx/templates/courgette/result_templates/map.html+1−1 searx/templates/courgette/result_templates/videos.html+2−4 searx/templates/courgette/results.html+3−3 searx/templates/default/infobox.html+2−1 searx/templates/default/result_templates/default.html+1−1 searx/templates/default/result_templates/images.html+1−1 searx/templates/default/result_templates/map.html+1−1 searx/templates/default/result_templates/torrent.html+2−3 searx/templates/default/result_templates/videos.html+2−4 searx/templates/default/results.html+1−1 searx/tests/test_webapp.py+1−1

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

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

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

33 {% if result['favicon'] %}

4− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />

4+ <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />

55 {% endif %}

77 <div>

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

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

11<div class="image_result">

22 <p>

3− <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title={{ result.title }}/></a>

3+ <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>

44 <span class="url"><a href="{{ result.url }}" class="small_font">original context</a></span>

55 </p>

66</div>

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

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

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

33 {% if result['favicon'] %}

4− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />

4+ <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />

55 {% endif %}

77 <div>

searx/templates/courgette/result_templates/videos.html+2−4

@@ -1,12 +1,10 @@

11<div class="result">

22 {% if result['favicon'] %}

3− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />

3+ <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />

44 {% endif %}

6− <p>

76 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

87 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}

9− <a href="{{ result.url }}"><img width="400px" src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>

8+ <a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>

109 <p class="url">{{ result.url }}</p>

11− </p>

1210</div>

searx/templates/courgette/results.html+3−3

@@ -10,7 +10,7 @@

1010

1111 <div id="search_url">

1212 {{ _('Search URL') }}:

13− <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}" readonly="" />

13+ <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_")|replace(' ','+') }}{% endif %}" readonly />

1414 </div>

1515 <div id="apis">

1616 {{ _('Download results') }}

@@ -43,9 +43,9 @@

4343

4444 {% for result in results %}

4545 {% if result['template'] %}

46− {% include 'default/result_templates/'+result['template'] %}

46+ {% include 'courgette/result_templates/'+result['template'] %}

4747 {% else %}

48− {% include 'default/result_templates/default.html' %}

48+ {% include 'courgette/result_templates/default.html' %}

4949 {% endif %}

5050 {% endfor %}

5151

searx/templates/default/infobox.html+2−1

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

11<div class="infobox">

22 <h2>{{ infobox.infobox }}</h2>

3− {% if infobox.img_src %}<img src="{{ infobox.img_src }}" />{% endif %}

3+ {% if infobox.img_src %}<img src="{{ infobox.img_src }}" title="{{ infobox.infobox|striptags }}" alt="{{ infobox.infobox|striptags }}" />{% endif %}

44 <p>{{ infobox.entity }}</p>

55 <p>{{ infobox.content | safe }}</p>

66 {% if infobox.attributes %}

@@ -42,3 +42,4 @@

4242 <br />

4343

4444</div>

45+ name=

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

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

11<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" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

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 }}">{{ result.title|safe }}</a></h3>

33 <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>

44 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}

55 <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/default/result_templates/images.html+1−1

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

11<div class="image_result">

22 <p>

3− <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title }}"/></a>

3+ <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}" /></a>

44 <span class="url"><a href="{{ result.url }}" class="small_font">original context</a></span>

55 </p>

66</div>

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

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

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

33 {% if result['favicon'] %}

4− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />

4+ <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />

55 {% endif %}

77 <div>

searx/templates/default/result_templates/torrent.html+2−3

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

11<div class="result torrent_result">

22 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

3− {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %}

4− <p class="stats">Seed: {{ result.seed }}, Leech: {{ result.leech }}</p>

5− <p><a href="{{ result.magnetlink }}" class="magnetlink">magnet link</a></p>

63 <p class="url">{{ result.pretty_url }}</p>

4+ {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %}

5+ <p><a href="{{ result.magnetlink }}" class="magnetlink">magnet link</a> - <span class="stats">Seed: {{ result.seed }}, Leech: {{ result.leech }}</span></p>

76</div>

searx/templates/default/result_templates/videos.html+2−4

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

11<div class="result">

2− <p>

3− <h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

43 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}

5− <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>

4+ <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>

65 <p class="url">{{ result.url }}</p>

7− </p>

86</div>

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

@@ -10,7 +10,7 @@

1010

1111 <div id="search_url">

1212 {{ _('Search URL') }}:

13− <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}" readonly="" />

1414 </div>

1515 <div id="apis">

1616 {{ _('Download results') }}

searx/tests/test_webapp.py+1−1

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

4949 )

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

5151 self.assertIn(

52− '<h3 class="result_title"> <img width="14" height="14" class="favicon" src="static/default/img/icon_youtube.ico" /><a href="http://first.test.xyz">First <span class="highlight">Test</span></a></h3>', # noqa

52+ '<h3 class="result_title"> <img width="14" height="14" class="favicon" src="static/default/img/icon_youtube.ico" alt="youtube" /><a href="http://first.test.xyz">First <span class="highlight">Test</span></a></h3>', # noqa

5353 result.data

5454 )

5555 self.assertIn(