Commit 52ac2dee authored by Martin Fischbach's avatar Martin Fischbach
Browse files

recovered image include

parent bde45d1f
Pipeline #20927 passed with stage
in 14 minutes and 26 seconds
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
{% endif %} {% endif %}
{% if url %} {% if url %}
{% if url=="none" %} {% if url=="none" %}
{% imgsrcset src="include.image" dimension="dimension" sizes="(min-width: 1180px) 320px, (min-width: 980px) 260px, (min-width: 740px) 50vw, 100vw" class=include.imageclass style= %} {% include image src=include.image dimension=dimension sizes="(min-width: 1180px) 320px, (min-width: 980px) 260px, (min-width: 740px) 50vw, 100vw" class=include.imageclass style=include.imagestyle %}
{% else %} {% else %}
<a href="{{ url }}"> <a href="{{ url }}">
{% imgsrcset src="include.image" dimension="dimension" sizes="(min-width: 1180px) 500px, (min-width: 980px) 410px, (min-width: 740px) 50vw, 100vw" class=include.imageclass style= %} {% include image src=include.image dimension=dimension sizes="(min-width: 1180px) 500px, (min-width: 980px) 410px, (min-width: 740px) 50vw, 100vw" class=include.imageclass style=include.imagestyle %}
</a> </a>
{% endif %} {% endif %}
{% else %} {% else %}
{% imgsrcset src="include.image" dimension="dimension" sizes="(min-width: 1180px) 320px, (min-width: 980px) 260px, (min-width: 740px) 50vw, 100vw" class=include.imageclass style= %} {% include image src=include.image dimension=dimension sizes="(min-width: 1180px) 320px, (min-width: 980px) 260px, (min-width: 740px) 50vw, 100vw" class=include.imageclass style=include.imagestyle %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if include.title %} {% if include.title %}
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
How to Find Us How to Find Us
</div> </div>
<a href="https://wueaddress.uni-wuerzburg.de/search/map/3511"> <a href="https://wueaddress.uni-wuerzburg.de/search/map/3511">
{% imgsrcset src="general/map.jpg" dimension="wide" %} {% include image src="general/map.jpg" dimension="wide" %}
</a> </a>
</div> </div>
</div> </div>
...@@ -45,4 +45,4 @@ ...@@ -45,4 +45,4 @@
<div><a href="https://www.uni-wuerzburg.de/sonstiges/kontakt/">University Contact</a></div> <div><a href="https://www.uni-wuerzburg.de/sonstiges/kontakt/">University Contact</a></div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
{% if include.sizes %} {% if include.sizes %}
{% assign sizes = include.sizes %} {% assign sizes = include.sizes %}
{% else %} {% else %}
{% assign sizes = "(min-width: 1180px) 1024px, (min-width: 980px) 844px, (min-width: 740px) 604, 100vw" %} {% assign sizes = "(min-width: 1180px) 1024px, (min-width: 980px) 844px, (min-width: 740px) 604px, 100vw" %}
{% endif %} {% endif %}
{% assign srcset = "" | split: "|" %} {% assign srcset = "" | split: "|" %}
{% for width in site.widths %} {% for width in site.widths %}
{% capture src %}{{ site.baseurl }}/bundled/images/{{ width }}/{{ include.src }} {{ width }}w{% endcapture %} {% capture src %}{{ site.image_url }}/{{ width }}/{{ include.src }} {{ width }}w{% endcapture %}
{% assign srcset = srcset | push: src %} {% assign srcset = srcset | push: src %}
{% endfor %} {% endfor %}
{% assign srcset = srcset | join: ", " %} {% assign srcset = srcset | join: ", " %}
...@@ -16,20 +16,32 @@ ...@@ -16,20 +16,32 @@
{% if include.caption %} {% if include.caption %}
<figure> <figure>
<img <img
src = "{{ site.baseurl }}/bundled/images/{{ site.widths.first }}/{{ include.src }}" src = "{{ site.image_url }}/{{ include.src }}"
alt = "" alt = ""
sizes = "{{ sizes }}" sizes = "{{ sizes }}"
srcset = "{{ srcset }}" srcset = "{{ srcset }}"
{% if include.width %}style = "width:{{ include.width }};"{% else %}{% endif %}
/> />
<figcaption>{{ include.caption }}</figcaption> <figcaption {% if include.width %}style = "width:{{ include.width }};"{% else %}{% endif %}>{{ include.caption }}</figcaption>
</figure> </figure>
{% else %} {% else %}
<img {% if include.ar %}
src = "{{ site.baseurl }}/bundled/images/{{ site.widths.first }}/{{ include.src }}" <a rel="ar" href="{{ site.baseurl }}/{{ include.ar }}"><img
alt = "" src = "{{ site.image_url }}/{{ include.src }}"
sizes = "{{ sizes }}" alt = ""
srcset = "{{ srcset }}" sizes = "{{ sizes }}"
/> srcset = "{{ srcset }}"
{% if include.width %}style = "width:{{ include.width }};"{% else %}{% endif %}
/></a>
{% else %}
<img
src = "{{ site.image_url }}/{{ include.src }}"
alt = ""
sizes = "{{ sizes }}"
srcset = "{{ srcset }}"
{% if include.width %}style = "width:{{ include.width }};"{% else %}{% endif %}
/>
{% endif %}
{% endif %} {% endif %}
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -10,4 +10,4 @@ ...@@ -10,4 +10,4 @@
{% assign height = 360 %} {% assign height = 360 %}
{% endif %} {% endif %}
<iframe width="{{ width }}" height="{{ height }}" src="https://www.youtube.com/embed/{{ include.id }}" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe> <iframe width="{{ width }}" height="{{ height }}" src="https://www.youtube.com/embed/{{ include.id }}" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
\ No newline at end of file
...@@ -94,16 +94,16 @@ ...@@ -94,16 +94,16 @@
{% for slide in slides %} {% for slide in slides %}
{% if forloop.index == 1 %} {% if forloop.index == 1 %}
{% assign class = "" %} {% assign class = "" %}
{% imgsrcset src="slide" sizes="(min-width: 1180px) 1200, (min-width: 980px) 1020px, (min-width: 740px) 720px, 100vw" %} {% include image src=slide sizes="(min-width: 1180px) 1200, (min-width: 980px) 1020px, (min-width: 740px) 720px, 100vw" %}
{% else %} {% else %}
{% imgsrcset src="slide" class="hide" sizes="(min-width: 1180px) 1200, (min-width: 980px) 1020px, (min-width: 740px) 720px, 100vw" %} {% include image src=slide class="hide" sizes="(min-width: 1180px) 1200, (min-width: 980px) 1020px, (min-width: 740px) 720px, 100vw" %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
{% elsif slides.size == 1 %} {% elsif slides.size == 1 %}
<div class="single-slide"> <div class="single-slide">
{% assign first_image = slides.first %} {% assign first_image = slides.first %}
{% imgsrcset src="first_image" dimension="panorama"%} {% include image src="first_image" dimension="panorama"%}
</div> </div>
{% endif %} {% endif %}
</div> </div>
...@@ -129,4 +129,4 @@ ...@@ -129,4 +129,4 @@
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -23,6 +23,6 @@ layout: text ...@@ -23,6 +23,6 @@ layout: text
{{ page.date | date: "%Y" }} {{ page.date | date: "%Y" }}
{% else %}{{ page.date | date_to_string }}{% endif %} {% else %}{{ page.date | date_to_string }}{% endif %}
{% unless page.blank == true %}{% imgsrcset src=page.image dimension="wide" %}{% endunless %} {% unless page.blank == true %}{% include image src=page.image dimension="wide" %}{% endunless %}
{{ content }} {{ content }}
...@@ -7,4 +7,4 @@ layout: base ...@@ -7,4 +7,4 @@ layout: base
{% else %} {% else %}
{{ content }} {{ content }}
{% endif %} {% endif %}
</div> </div>
\ No newline at end of file
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Build # Build
bundle bundle
bundle update bundle update
bundle exec war&
jekyll serve --host=0.0.0.0 --port=4200 --trace --incremental& jekyll serve --host=0.0.0.0 --port=4200 --trace --incremental&
PIDS[0]=$! PIDS[0]=$!
trap "kill ${PIDS[*]}" SIGINT trap "kill ${PIDS[*]}" SIGINT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment