zaclys/searxng
1
0
Fork 1
mirror of https://github.com/searxng/searxng synced 2024-01-01 19:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/asciimoo/searx into code_results

Browse source 
Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html
This commit is contained in:
Thomas Pointhuber 2015-01-09 21:25:13 +01:00
commit 400b54191c
252 changed files with 1747 additions and 600 deletions
Download patch file Download diff file Expand all files Collapse all files

2
searx/templates/oscar/result_templates/code.html
View file

@ -1,6 +1,6 @@
{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}
{{ result_header(result) }}
{{ result_header(result, favicons) }}
{{ result_sub_header(result) }}
{% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}

16
searx/templates/oscar/result_templates/default.html
View file

@ -1,8 +1,20 @@
{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer %}
{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}
{{ result_header(result) }}
{{ result_header(result, favicons) }}
{{ result_sub_header(result) }}
{% if result.embedded %}
<small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader" data-toggle="collapse" data-target="#result-media-{{ index }}" data-btn-text-collapsed="{{ _('show media') }}" data-btn-text-not-collapsed="{{ _('hide media') }}">{{ icon('music') }} {{ _('show media') }}</a></small>
{% endif %}
{% if result.embedded %}
<div id="result-media-{{ index }}" class="collapse">
{% autoescape false %}
{{ result.embedded }}
{% endautoescape %}
</div>
{% endif %}
{% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
{{ result_footer(result) }}

2
searx/templates/oscar/result_templates/images.html
View file

@ -9,7 +9,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title">{% if result['favicon'] %}{{ draw_favicon(result['favicon']) }} {% endif %}{{ result.title|striptags }}</h4>
<h4 class="modal-title">{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{{ result.title|striptags }}</h4>
</div>
<div class="modal-body">
<img class="img-responsive center-block" src="{{ result.img_src }}" alt="{{ result.title }}">

2
searx/templates/oscar/result_templates/map.html
View file

@ -1,6 +1,6 @@
{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}
{{ result_header(result) }}
{{ result_header(result, favicons) }}
{{ result_sub_header(result) }}
{% if (result.latitude and result.longitude) or result.boundingbox %}

2
searx/templates/oscar/result_templates/torrent.html
View file

@ -1,6 +1,6 @@
{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}
{{ result_header(result) }}
{{ result_header(result, favicons) }}
{{ result_sub_header(result) }}
<p class="result-content">{{ icon('transfer') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span>, {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span>

18
searx/templates/oscar/result_templates/videos.html
View file

@ -1,11 +1,23 @@
{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer %}
{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}
{{ result_header(result) }}
{{ result_header(result, favicons) }}
{{ result_sub_header(result) }}
{% if result.embedded %}
<small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader" data-toggle="collapse" data-target="#result-video-{{ index }}" data-btn-text-collapsed="{{ _('show video') }}" data-btn-text-not-collapsed="{{ _('hide video') }}">{{ icon('film') }} {{ _('show video') }}</a></small>
{% endif %}
{% if result.embedded %}
<div id="result-video-{{ index }}" class="collapse">
{% autoescape false %}
{{ result.embedded }}
{% endautoescape %}
</div>
{% endif %}
<div class="container-fluid">
<div class="row">
<img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ result.thumbnail|safe }}" alt="{{ result.title|urlencode }} {{ result['favicon'] }}" />
<a href="{{ result.url }}"><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ result.thumbnail|safe }}" alt="{{ result.title|striptags }} {{ result.engine }}" /></a>
{% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8 result-content">{{ result.content|safe }}</p>{% endif %}
</div>
</div>