diff --git a/VIPSWeb/settings.py b/VIPSWeb/settings.py index f1eb89488c4e58488cebdc8e74a8f17c337bf024..ed6c09f7dee2e1c964ec15a7203f874a7c32f9b6 100755 --- a/VIPSWeb/settings.py +++ b/VIPSWeb/settings.py @@ -85,7 +85,7 @@ MIDDLEWARE = ( 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', - 'common.middleware.whodid.WhodidMiddleware', + #'common.middleware.whodid.WhodidMiddleware', 'django.middleware.locale.LocaleMiddleware', 'security.middleware.check_login_middleware.CheckLoginMiddleware' # Uncomment the next line for simple clickjacking protection: diff --git a/VIPSWeb/templates/base.html b/VIPSWeb/templates/base.html index 1a1f6e1d65906e18a9e4ef0668db2a3e634ae11c..da90bf70826aa3c1a4b2b2f58369fb9271193be2 100755 --- a/VIPSWeb/templates/base.html +++ b/VIPSWeb/templates/base.html @@ -19,7 +19,7 @@ * */ -{% endcomment %}{% load i18n staticfiles template_helper %}<!DOCTYPE html> +{% endcomment %}{% load i18n static template_helper %}<!DOCTYPE html> <html lang="no"> <head> <meta charset="utf-8"> diff --git a/VIPSWeb/templates/base_with_date_picker.html b/VIPSWeb/templates/base_with_date_picker.html index 4802711c668908382304343a5c336611a6824c9b..784b35701071448e6bb01ad25e34d34b990d5389 100755 --- a/VIPSWeb/templates/base_with_date_picker.html +++ b/VIPSWeb/templates/base_with_date_picker.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% comment %} /* diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html index 7523c55e6ff6da6770601f4b95c316e363d381eb..e46040582cca0ae4f498133b99ddabfe955d6966 100755 --- a/VIPSWeb/templates/index.html +++ b/VIPSWeb/templates/index.html @@ -21,7 +21,7 @@ */ {% endcomment %} -{% load i18n l10n staticfiles forecast_extras template_helper %} +{% load i18n l10n static forecast_extras template_helper %} {% block title%}{% trans "Welcome" %}{%endblock%} {% block customCSS %} <link rel="stylesheet" href="{% static "css/3rdparty/ol.css" %}" type="text/css"> diff --git a/VIPSWeb/templates/index_old.html b/VIPSWeb/templates/index_old.html index ada6a5674b8a6cc99376e0cef9fbfe5f0b141cbe..cd1a9bca2917c7f120ffec88035e3b65992f8717 100755 --- a/VIPSWeb/templates/index_old.html +++ b/VIPSWeb/templates/index_old.html @@ -21,7 +21,7 @@ */ {% endcomment %} -{% load i18n l10n staticfiles forecast_extras template_helper %} +{% load i18n l10n static forecast_extras template_helper %} {% block title%}{% trans "Welcome" %}{%endblock%} {% block customCSS %} <link rel="stylesheet" href="{% static "css/3rdparty/ol.css" %}" type="text/css"> diff --git a/applefruitmoth/templates/applefruitmoth/index.html b/applefruitmoth/templates/applefruitmoth/index.html index e4bcde15bb2457731deed094c4e94774498a8106..4d2f2218113268e6c719dc2d301d7b74bff8724c 100755 --- a/applefruitmoth/templates/applefruitmoth/index.html +++ b/applefruitmoth/templates/applefruitmoth/index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% comment %} # diff --git a/calculators/templates/calculators/eil.html b/calculators/templates/calculators/eil.html index 64063cf88c2c4d5f5d102284f0aa7dfc103d736a..4b8fedb6643d7300fcc5c322a8cf16e62be8332d 100755 --- a/calculators/templates/calculators/eil.html +++ b/calculators/templates/calculators/eil.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% comment %} # diff --git a/calculators/templates/calculators/index.html b/calculators/templates/calculators/index.html index a544cb7e29e7c86537aad515ae6a88f7eead1087..aa4e43a0ce95955d23b4f8a2e3a7abdabefd3772 100755 --- a/calculators/templates/calculators/index.html +++ b/calculators/templates/calculators/index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% comment %} # diff --git a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html index d1e727ef757b9fc019c43d18e778cfc1eca07062..feb21cdcfc8c5dc90bdc6fd3fb2582076c8f2d8d 100755 --- a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html +++ b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html @@ -1,5 +1,5 @@ {% extends "base_with_date_picker.html" %} -{% load staticfiles %} +{% load static %} {% comment %} # diff --git a/cerealblotchmodels/templates/cerealblotchmodels/index.html b/cerealblotchmodels/templates/cerealblotchmodels/index.html index e34160dda9330545103bd47cdbd568d3a8a99602..0f6f6445fcd63e7d0c1f9f22519fbdbc791f13d3 100755 --- a/cerealblotchmodels/templates/cerealblotchmodels/index.html +++ b/cerealblotchmodels/templates/cerealblotchmodels/index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% comment %} # diff --git a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html b/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html index 44792cf03e35a3874ab9010bb59176d07f47f9ce..8eb339989dfc75ff400496ee3bda1e94e3b5707d 100644 --- a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html +++ b/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html @@ -1,5 +1,5 @@ {% extends "base_with_date_picker.html" %} -{% load staticfiles %} +{% load static %} {% comment %} # diff --git a/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html b/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html index 1932211037aa8fd1d6b4e1893a86b84893400bcd..dd9c8e9af4d30df2582301fc4771cb1c0fd5d407 100755 --- a/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html +++ b/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html @@ -1,5 +1,5 @@ {% extends "base_with_date_picker.html" %} -{% load staticfiles %} +{% load static %} {% comment %} # diff --git a/cydiapomonella/templates/cydiapomonella/index.html b/cydiapomonella/templates/cydiapomonella/index.html index 14494e78d207161f879a31abbda212caec9c2962..a388589964ba2329dc306d9e60b72f84cf620aef 100644 --- a/cydiapomonella/templates/cydiapomonella/index.html +++ b/cydiapomonella/templates/cydiapomonella/index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% comment %} # diff --git a/forecasts/templates/forecasts/detail.html b/forecasts/templates/forecasts/detail.html index d3b015a6ddf8efc5aa52ff485530838a9bb096ad..37466a56ad920cf13778419a01812fbd1e932b57 100755 --- a/forecasts/templates/forecasts/detail.html +++ b/forecasts/templates/forecasts/detail.html @@ -21,7 +21,7 @@ # @author: Tor-Einar Skog {% endcomment %} -{% load i18n l10n staticfiles forecast_extras %} +{% load i18n l10n static forecast_extras %} {% block title%}{% trans "Details" %}{%endblock%} {% block content %} <h1>{% trans "Details" %}</h1> diff --git a/forecasts/templates/forecasts/detail_error.html b/forecasts/templates/forecasts/detail_error.html index 0e9259b9c348602e31dd11f670c894e607d58b0a..37b3dca6a65843850d323e60326c616913d8b49c 100755 --- a/forecasts/templates/forecasts/detail_error.html +++ b/forecasts/templates/forecasts/detail_error.html @@ -21,7 +21,7 @@ # @author: Tor-Einar Skog {% endcomment %} -{% load i18n l10n staticfiles forecast_extras %} +{% load i18n l10n static forecast_extras %} {% block title%}{% trans "Details" %}{%endblock%} {% block content %} <h1>{% trans "Error with details" %}</h1> diff --git a/forecasts/templates/forecasts/index.html b/forecasts/templates/forecasts/index.html index c6360412af9989f4aaca9b8a66724d0ebc714f19..0ecae3aeddd63d46481770a5f3a6f052133b7e95 100755 --- a/forecasts/templates/forecasts/index.html +++ b/forecasts/templates/forecasts/index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% comment %} # diff --git a/fusarium/templates/fusarium/oat_flowering.html b/fusarium/templates/fusarium/oat_flowering.html index 39b537a3f40762b139a63847df815bfe34b39593..7bdd13a872021d678f227be96d45e61105317b8d 100755 --- a/fusarium/templates/fusarium/oat_flowering.html +++ b/fusarium/templates/fusarium/oat_flowering.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n staticfiles %} +{% load i18n static %} {% block title%}{% trans "Oat flowering model" %}{%endblock%} {% block extendCSS %} diff --git a/information/templates/information/detail.html b/information/templates/information/detail.html index a4e484c154400f7555118ddd46bf9939aab70aa3..a4ed65285b906e48b625850bfd563a29c7cf63a3 100755 --- a/information/templates/information/detail.html +++ b/information/templates/information/detail.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n staticfiles %} +{% load i18n static %} {% block title%}{{information_locale.headline}}{%endblock%} {% block content %} <div class="col-md-3"> diff --git a/information/templates/information/index.html b/information/templates/information/index.html index 3377f184c60d2fcba51457f710f18a62ee4f464a..d7b7cb603afa50412d5b6feebf14c03e66e4638f 100755 --- a/information/templates/information/index.html +++ b/information/templates/information/index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n staticfiles %} +{% load i18n static %} {% block title%}{% trans "Information" %}{%endblock%} {% block content %} <h1>{% trans "Information" %}</h1> diff --git a/observations/templates/observations/detail.html b/observations/templates/observations/detail.html index 49015d4e5a22fa480407e6adec557dec6ef04ec2..bdce9dd9a0481fdb7add4967649290d231803081 100755 --- a/observations/templates/observations/detail.html +++ b/observations/templates/observations/detail.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n l10n staticfiles %} +{% load i18n l10n static %} {% comment %} # diff --git a/observations/templates/observations/index.html b/observations/templates/observations/index.html index a8c6b84b3e8ca4d78983151db5c2dd43841b712a..385083b0cb1e63ab1b02559872824e1d2c7119bc 100644 --- a/observations/templates/observations/index.html +++ b/observations/templates/observations/index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% comment %} # diff --git a/observations/templates/observations/index_old.html b/observations/templates/observations/index_old.html index 6919283f5e8ef57c751088477ca92f9f57209cfe..580cb9df26d29bc88a694b7585f908b8badad6b0 100755 --- a/observations/templates/observations/index_old.html +++ b/observations/templates/observations/index_old.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% comment %} # diff --git a/requirements.txt b/requirements.txt index ea2d224ae0c6c4991dcea40c87f459eaac42bec1..75acf7100a0b4439b1804ae1eddc2b10841b60b9 100755 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ # Please add requirements here # Read docs for how this works: http://www.pip-installer.org/en/latest/cookbook.html -Django==2.2.17 +Django==3.0.11 Pillow requests==2.25.0 django-tinymce==2.8.0 diff --git a/roughage/templates/roughage/nutrition.html b/roughage/templates/roughage/nutrition.html index 9bb409e50ffb24445dedf1bb584642971bb5278b..037bcc959e048c26cbbeb2f2714f0d2e9eed5e88 100755 --- a/roughage/templates/roughage/nutrition.html +++ b/roughage/templates/roughage/nutrition.html @@ -20,7 +20,7 @@ # # @author: Tor-Einar Skog {% endcomment %} -{% load i18n l10n staticfiles template_helper %} +{% load i18n l10n static template_helper %} {% block title%}{% trans "Roughage nutrition model" %}{%endblock%} {% block content %} <div class="singleBlockContainer"> diff --git a/roughage/templates/roughage/nutrition_calibration.html b/roughage/templates/roughage/nutrition_calibration.html index adff50896bed0b6228b331f5e3de7628ae0b5fbd..60c0798cc020c18fbe495789676aecca878f5f9e 100644 --- a/roughage/templates/roughage/nutrition_calibration.html +++ b/roughage/templates/roughage/nutrition_calibration.html @@ -19,7 +19,7 @@ # # @author: Tor-Einar Skog {% endcomment %} -{% load i18n l10n staticfiles template_helper %} +{% load i18n l10n static template_helper %} {% block title%}{% trans "Roughage nutrition model" %}{%endblock%} {% block content %} <div class="singleBlockContainer"> diff --git a/vips_messages/templates/messages/index.html b/vips_messages/templates/messages/index.html index e754391c5600bc8729775b2010c5db28153c9903..6ea530810c5d04406ce135fecf3dd13fafd2d0a6 100755 --- a/vips_messages/templates/messages/index.html +++ b/vips_messages/templates/messages/index.html @@ -1,5 +1,5 @@ {% extends "base_with_date_picker.html" %} -{% load i18n staticfiles %} +{% load i18n static %} {% block title%}{% trans "Messages" %}{%endblock%} {% block extendCSS %} <link href="{% static "css/3rdparty/jquery-ui.min.css" %}" rel="stylesheet" media="screen" />