Merge branch 'master' into csp-oscar-theme

This commit is contained in:
Markus Heiser 2020-06-09 08:28:53 +00:00 committed by GitHub
commit d065b9e4fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 42 additions and 22 deletions

View file

@ -16,7 +16,11 @@
{%- if attribute.image -%}
<td><img class="img-responsive" src="{{ image_proxify(attribute.image.src) }}" alt="{{ attribute.image.alt }}" /></td>
{%- else -%}
<td><bdi>{{ attribute.value }}</bdi></td>
{% if attribute.label == 'Instance of' %}
<td><bdi><a href="https://wikidata.org/wiki/{{ attribute.value.id }}">{{ attribute.value.id }}</a></bdi></td>
{% else %}
<td><bdi>{{ attribute.value }}</bdi></td>
{%- endif -%}
{%- endif -%}
</tr>
{% endfor -%}

View file

@ -72,6 +72,8 @@
</form>
{% endfor %}
<div class="clearfix"></div>
<br /><label><a href="{{ search_url() }}&amp;format=rss">{{ _('RSS subscription') }}</a></label>
<div class="clearfix"></div>
</div>
</div>
</div><!-- /#sidebar_results -->
@ -100,7 +102,7 @@
{%- endif %}
{% for result in results -%}
<div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}">
<div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}{% for e in result.engines %} {{ e }}{% endfor %}">
{%- set index = loop.index -%}
{%- if result.template -%}
{% include get_result_template('oscar', result['template']) %}