diff --git a/Dockerfile b/Dockerfile index e37dd18bf0..3e35b95e1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,8 @@ RUN apt-get update -qq && apt-get install -y -qq \ libpango1.0-0 \ libpangocairo-1.0-0 \ libgdk-pixbuf2.0-dev \ - libffi-dev && \ + libffi-dev \ + libvips && \ apt-get install -y --no-install-recommends postgis && \ apt-get clean all && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/* diff --git a/geotrek/common/templates/common/hdviewpoint_detail.html b/geotrek/common/templates/common/hdviewpoint_detail.html index 5705a1123b..3c4c1ecca9 100644 --- a/geotrek/common/templates/common/hdviewpoint_detail.html +++ b/geotrek/common/templates/common/hdviewpoint_detail.html @@ -64,6 +64,16 @@

{% trans "Attributes" %}

{% else %}{% trans "None" %}{% endif %} + + {{ object|verbose:"date_insert" }} + {{ object.date_insert|date }} + + + + {{ object|verbose:"date_update" }} + {{ object.date_update|date }} + +

{% trans "Image" %}

diff --git a/requirements.txt b/requirements.txt index 3033643c1b..61bda813dd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -45,6 +45,7 @@ cffi==1.15.0 # via # cairocffi # persistent + # pyvips # weasyprint charset-normalizer==2.0.12 # via requests @@ -207,11 +208,11 @@ kombu==5.1.0 # via celery landez==2.5.0 # via geotrek (setup.py) -large-image==1.17.1 +large-image==1.17.2 # via # django-large-image - # large-image-source-pil -large-image-source-pil==1.17.1 + # large-image-source-vips +large-image-source-vips==1.17.2 # via geotrek (setup.py) lxml==4.8.0 # via mapentity @@ -226,10 +227,13 @@ munch==2.5.0 netifaces==0.11.0 # via mapentity numpy==1.23.4 - # via large-image + # via + # large-image + # large-image-source-vips packaging==21.3 # via # drf-yasg + # large-image-source-vips # redis palettable==3.3.0 # via large-image @@ -284,6 +288,8 @@ pytz==2022.1 # django-modelcluster # djangorestframework # djangorestframework-datatables +pyvips==2.2.1 + # via large-image-source-vips rcssmin==1.1.0 # via django-compressor redis==4.2.2 diff --git a/setup.py b/setup.py index e3f2996607..ce6b99edbe 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ def run(self): 'drf-yasg', 'xlrd', 'landez', - 'large-image-source-pil', + 'large-image-source-vips', 'django-large-image', 'celery[redis]', 'django-celery-results==2.2.*', # Latest version supporting python3.6