inventree/inventree-docs
2
0
Fork 0
mirror of https://github.com/inventree/inventree-docs.git synced 2025-04-28 05:36:46 +00:00
Code

Merge pull request #6 from inventree/revert-4-master

Browse Source 
Revert "Try config.site_url from macro context to serve images"
This commit is contained in:
Oliver 2020-09-22 13:06:06 +10:00 committed by GitHub
commit 1c8eb23e0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_includes/img.html
View File

@ -1,11 +1,13 @@
{% set assets = '/en/latest/assets' %}
<figure class='image'> <figure class='image'>
{% if id %} {% if id %}
<!-- The link that, when clicked, will display the image in full screen --> <!-- The link that, when clicked, will display the image in full screen -->
<a href="#{{ id }}"> <a href="#{{ id }}">
{% elif url %} {% elif url %}
<a href="{{ config.site_url }}assets/images/{{ url }}"> <a href="{{ assets }}/images/{{ url }}">
{% endif %} {% endif %}
<img class='img-inline' src='{{ config.site_url }}assets/images/{{ url }}' alt='{{ description }}' title='{{ description }}' <img class='img-inline' src='{{ assets }}/images/{{ url }}' alt='{{ description }}' title='{{ description }}'
{% if maxwidth or maxheight %}style=' {% if maxwidth or maxheight %}style='
{% if maxwidth %} max-width:{{ maxwidth }};{% endif %} {% if maxwidth %} max-width:{{ maxwidth }};{% endif %}
{% if maxheight %} max-height: {{ maxheight }};{% endif %} {% if maxheight %} max-height: {{ maxheight }};{% endif %}
@ -18,7 +20,7 @@
{% if id %} {% if id %}
<!-- The full screen image, hidden by default --> <!-- The full screen image, hidden by default -->
<a href="#_" class="overlay" id="{{ id }}"> <a href="#_" class="overlay" id="{{ id }}">
<img src="{{ config.site_url }}assets/images/{{ url }}" alt="{{ description }}" /> <img src="{{ assets }}/images/{{ url }}" alt="{{ description }}" />
</a> </a>
{% endif %} {% endif %}
</figure> </figure>