Skip to content

Update wagtail #111

Merged
merged 5 commits into from
Mar 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@
WAGTAILMODELTRANSLATION_TRANSLATE_SLUGS = False
WAGTAILMODELTRANSLATION_LOCALE_PICKER_DEFAULT = ('de', 'en')

WAGTAILEMBEDS_RESPONSIVE_HTML = True

# WAGTAIL
WAGTAIL_SITE_NAME = 'MPI CMS'
# WAGTAIL_USER_EDIT_FORM = 'mpicms.users.forms.CustomUserEditForm'
Expand Down
1,209 changes: 912 additions & 297 deletions locale/de/LC_MESSAGES/django.po

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mpicms/base/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from wagtail.core import hooks
from wagtail.search.models import Query
from wagtail.admin.views.account import LogoutView as LView
from wagtail.admin.views.pages import get_valid_next_url_from_request
from wagtail.admin.views.pages.utils import get_valid_next_url_from_request

from .utils import can_create

Expand Down
16 changes: 16 additions & 0 deletions mpicms/static/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -745,3 +745,19 @@ div.codehilite:not(:last-child) {
list-style: none;
margin: 0;
}

/* wagtail embed responsive objects */

.responsive-object {
position: relative;
}

.responsive-object iframe,
.responsive-object object,
.responsive-object embed {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
8 changes: 4 additions & 4 deletions patches/documents-and-images-support-partial-matches.patch
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ diff --git a/lib/python3.7/site-packages/wagtail/documents/views/chooser.py b/li
index 6adc3aa..dee0087 100644
--- a/lib/python3.7/site-packages/wagtail/documents/views/chooser.py
+++ b/lib/python3.7/site-packages/wagtail/documents/views/chooser.py
@@ -69,7 +69,7 @@ def chooser(request):
@@ -71,7 +71,7 @@ def chooser(request):
if searchform.is_valid():
q = searchform.cleaned_data['q']

Expand All @@ -35,7 +35,7 @@ diff --git a/lib/python3.7/site-packages/wagtail/documents/views/documents.py b/
index 4ce20fe..1228b95 100644
--- a/lib/python3.7/site-packages/wagtail/documents/views/documents.py
+++ b/lib/python3.7/site-packages/wagtail/documents/views/documents.py
@@ -53,7 +53,7 @@ def index(request):
@@ -55,7 +55,7 @@ def index(request):
form = SearchForm(request.GET, placeholder=_("Search documents"))
if form.is_valid():
query_string = form.cleaned_data['q']
Expand All @@ -48,7 +48,7 @@ diff --git a/lib/python3.7/site-packages/wagtail/images/views/chooser.py b/lib/p
index b36095e..b576f5d 100644
--- a/lib/python3.7/site-packages/wagtail/images/views/chooser.py
+++ b/lib/python3.7/site-packages/wagtail/images/views/chooser.py
@@ -99,7 +99,7 @@ def chooser(request):
@@ -101,7 +101,7 @@ def chooser(request):
if searchform.is_valid():
q = searchform.cleaned_data['q']

Expand All @@ -61,7 +61,7 @@ diff --git a/lib/python3.7/site-packages/wagtail/images/views/images.py b/lib/py
index edb1c40..e030224 100644
--- a/lib/python3.7/site-packages/wagtail/images/views/images.py
+++ b/lib/python3.7/site-packages/wagtail/images/views/images.py
@@ -46,7 +46,7 @@ def index(request):
@@ -48,7 +48,7 @@ def index(request):
if form.is_valid():
query_string = form.cleaned_data['q']

Expand Down
60 changes: 30 additions & 30 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,52 @@
#
# pip-compile --output-file=base.txt base.in
#
anyascii==0.1.7 # via wagtail
arrow==0.14.7 # via ics
asgiref==3.2.10 # via django
asgiref==3.3.1 # via django
beautifulsoup4==4.8.2 # via wagtail
certifi==2020.6.20 # via requests
chardet==3.0.4 # via requests
django-auth-ldap==2.2.0 # via -r base.in
certifi==2020.12.5 # via requests
chardet==4.0.0 # via requests
django-auth-ldap==2.3.0 # via -r base.in
django-enumchoicefield==2.0.0 # via wagtailvideos
django-filter==2.3.0 # via wagtail
django-modelcluster==5.0.2 # via wagtail
django-modeltranslation==0.15.1 # via wagtail-modeltranslation
django-filter==2.4.0 # via wagtail
django-modelcluster==5.1 # via wagtail
django-modeltranslation==0.16.2 # via wagtail-modeltranslation
django-taggit==1.3.0 # via wagtail
django-treebeard==4.3.1 # via wagtail
django==3.1 # via -r base.in, django-auth-ldap, django-enumchoicefield, django-filter, django-modeltranslation, django-taggit, django-treebeard, djangorestframework, wagtail, wagtailvideos
djangorestframework==3.11.1 # via wagtail
django-treebeard==4.5.1 # via wagtail
django==3.1.7 # via -r base.in, django-auth-ldap, django-enumchoicefield, django-filter, django-modeltranslation, django-taggit, django-treebeard, djangorestframework, wagtail, wagtailvideos
djangorestframework==3.12.2 # via wagtail
draftjs-exporter==2.1.7 # via wagtail
et-xmlfile==1.0.1 # via openpyxl
html5lib==1.1 # via wagtail
ics==0.7 # via -r base.in
idna==2.10 # via requests
importlib-metadata==1.7.0 # via markdown
jdcal==1.4.1 # via openpyxl
l18n==2018.5 # via wagtail
markdown==3.2.2 # via -r base.in
openpyxl==3.0.4 # via tablib
pillow==7.2.0 # via wagtail
psycopg2-binary==2.8.5 # via -r base.in
importlib-metadata==3.7.3 # via markdown
l18n==2020.6.1 # via wagtail
markdown==3.3.4 # via -r base.in
openpyxl==3.0.7 # via tablib
pillow==8.1.2 # via wagtail
psycopg2-binary==2.8.6 # via -r base.in
pyasn1-modules==0.2.8 # via python-ldap
pyasn1==0.4.8 # via pyasn1-modules, python-ldap
pygments==2.6.1 # via -r base.in
pygments==2.8.1 # via -r base.in
python-dateutil==2.8.1 # via arrow, ics
python-ldap==3.3.1 # via django-auth-ldap
pytz==2020.1 # via django, django-modelcluster, l18n
requests==2.24.0 # via wagtail
pytz==2021.1 # via django, django-modelcluster, l18n
requests==2.25.1 # via wagtail
six==1.15.0 # via django-modeltranslation, html5lib, ics, l18n, python-dateutil
soupsieve==2.0.1 # via beautifulsoup4
sqlparse==0.3.1 # via django
tablib[xls,xlsx]==2.0.0 # via wagtail
soupsieve==2.2.1 # via beautifulsoup4
sqlparse==0.4.1 # via django
tablib[xls,xlsx]==3.0.0 # via wagtail
tatsu==4.4.0 # via ics
unidecode==1.1.1 # via wagtail
urllib3==1.25.10 # via requests
wagtail-modeltranslation==0.10.15 # via -r base.in
wagtail==2.10 # via -r base.in, wagtail-modeltranslation, wagtailvideos
typing-extensions==3.7.4.3 # via importlib-metadata
urllib3==1.26.4 # via requests
wagtail-modeltranslation==0.10.17 # via -r base.in
wagtail==2.12.3 # via -r base.in, wagtail-modeltranslation, wagtailvideos
git+https://github.com/neon-jungle/wagtailvideos@3cd93351b67c7d72a0b6b4ac74a62410d5e6bccb # via -r base.in
webencodings==0.5.1 # via html5lib
willow==1.4 # via wagtail
xlrd==1.2.0 # via tablib
xlsxwriter==1.3.2 # via wagtail
xlrd==2.0.1 # via tablib
xlsxwriter==1.3.7 # via wagtail
xlwt==1.3.0 # via tablib
zipp==3.1.0 # via importlib-metadata
zipp==3.4.1 # via importlib-metadata
124 changes: 62 additions & 62 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,99 +4,99 @@
#
# pip-compile --output-file=dev.txt dev.in
#
anyascii==0.1.7 # via -r ./test.txt, wagtail
arrow==0.14.7 # via -r ./test.txt, ics
asgiref==3.2.10 # via -r ./test.txt, django
astroid==2.4.2 # via pylint
attrs==19.3.0 # via -r ./test.txt, pytest
asgiref==3.3.1 # via -r ./test.txt, django
astroid==2.5.1 # via pylint
attrs==20.3.0 # via -r ./test.txt, pytest
backcall==0.2.0 # via ipython
beautifulsoup4==4.8.2 # via -r ./test.txt, wagtail
certifi==2020.6.20 # via -r ./test.txt, requests
chardet==3.0.4 # via -r ./test.txt, requests
certifi==2020.12.5 # via -r ./test.txt, requests
chardet==4.0.0 # via -r ./test.txt, requests
click==7.1.2 # via pip-tools
coverage==5.2.1 # via -r ./test.txt, django-coverage-plugin
decorator==4.4.2 # via ipython, traitlets
django-auth-ldap==2.2.0 # via -r ./test.txt
coverage==5.5 # via -r ./test.txt, django-coverage-plugin
decorator==4.4.2 # via ipython
django-auth-ldap==2.3.0 # via -r ./test.txt
django-coverage-plugin==1.8.0 # via -r ./test.txt
django-debug-toolbar==2.2 # via -r dev.in
django-debug-toolbar==3.2 # via -r dev.in
django-enumchoicefield==2.0.0 # via -r ./test.txt, wagtailvideos
django-filter==2.3.0 # via -r ./test.txt, wagtail
django-modelcluster==5.0.2 # via -r ./test.txt, wagtail
django-modeltranslation==0.15.1 # via -r ./test.txt, wagtail-modeltranslation
django-filter==2.4.0 # via -r ./test.txt, wagtail
django-modelcluster==5.1 # via -r ./test.txt, wagtail
django-modeltranslation==0.16.2 # via -r ./test.txt, wagtail-modeltranslation
django-taggit==1.3.0 # via -r ./test.txt, wagtail
django-treebeard==4.3.1 # via -r ./test.txt, wagtail
django==3.1 # via -r ./test.txt, django-auth-ldap, django-debug-toolbar, django-enumchoicefield, django-filter, django-modeltranslation, django-taggit, django-treebeard, djangorestframework, wagtail, wagtailvideos
djangorestframework==3.11.1 # via -r ./test.txt, wagtail
django-treebeard==4.5.1 # via -r ./test.txt, wagtail
django==3.1.7 # via -r ./test.txt, django-auth-ldap, django-debug-toolbar, django-enumchoicefield, django-filter, django-modeltranslation, django-taggit, django-treebeard, djangorestframework, wagtail, wagtailvideos
djangorestframework==3.12.2 # via -r ./test.txt, wagtail
draftjs-exporter==2.1.7 # via -r ./test.txt, wagtail
et-xmlfile==1.0.1 # via -r ./test.txt, openpyxl
factory-boy==2.12.0 # via -r dev.in
faker==4.1.1 # via factory-boy
flake8==3.8.3 # via -r ./test.txt
factory-boy==3.2.0 # via -r dev.in
faker==6.6.2 # via factory-boy
flake8==3.9.0 # via -r ./test.txt
html5lib==1.1 # via -r ./test.txt, wagtail
ics==0.7 # via -r ./test.txt
idna==2.10 # via -r ./test.txt, requests
importlib-metadata==1.7.0 # via -r ./test.txt, flake8, markdown, pluggy, pytest
iniconfig==1.0.1 # via -r ./test.txt, pytest
ipdb==0.13.3 # via -r dev.in
importlib-metadata==3.7.3 # via -r ./test.txt, flake8, markdown, pep517, pluggy, pytest
iniconfig==1.1.1 # via -r ./test.txt, pytest
ipdb==0.13.7 # via -r dev.in
ipython-genutils==0.2.0 # via traitlets
ipython==7.17.0 # via ipdb
isort==4.3.21 # via pylint
jdcal==1.4.1 # via -r ./test.txt, openpyxl
jedi==0.17.2 # via ipython
l18n==2018.5 # via -r ./test.txt, wagtail
lazy-object-proxy==1.4.3 # via astroid
markdown==3.2.2 # via -r ./test.txt
ipython==7.21.0 # via ipdb
isort==5.7.0 # via pylint
jedi==0.18.0 # via ipython
l18n==2020.6.1 # via -r ./test.txt, wagtail
lazy-object-proxy==1.5.2 # via astroid
markdown==3.3.4 # via -r ./test.txt
mccabe==0.6.1 # via -r ./test.txt, flake8, pylama, pylint
more-itertools==8.4.0 # via -r ./test.txt, pytest
openpyxl==3.0.4 # via -r ./test.txt, tablib
packaging==20.4 # via -r ./test.txt, pytest
parso==0.7.1 # via jedi
openpyxl==3.0.7 # via -r ./test.txt, tablib
packaging==20.9 # via -r ./test.txt, pytest
parso==0.8.1 # via jedi
pep517==0.10.0 # via pip-tools
pexpect==4.8.0 # via ipython
pickleshare==0.7.5 # via ipython
pillow==7.2.0 # via -r ./test.txt, wagtail
pip-tools==5.3.1 # via -r dev.in
pillow==8.1.2 # via -r ./test.txt, wagtail
pip-tools==6.0.1 # via -r dev.in
pluggy==0.13.1 # via -r ./test.txt, pytest
prompt-toolkit==3.0.6 # via ipython
psycopg2-binary==2.8.5 # via -r ./test.txt
ptyprocess==0.6.0 # via pexpect
py==1.9.0 # via -r ./test.txt, pytest
prompt-toolkit==3.0.17 # via ipython
psycopg2-binary==2.8.6 # via -r ./test.txt
ptyprocess==0.7.0 # via pexpect
py==1.10.0 # via -r ./test.txt, pytest
pyasn1-modules==0.2.8 # via -r ./test.txt, python-ldap
pyasn1==0.4.8 # via -r ./test.txt, pyasn1-modules, python-ldap
pycodestyle==2.6.0 # via -r ./test.txt, flake8, pylama
pydocstyle==5.0.2 # via pylama
pyflakes==2.2.0 # via -r ./test.txt, flake8, pylama
pygments==2.6.1 # via -r ./test.txt, ipython
pycodestyle==2.7.0 # via -r ./test.txt, flake8, pylama
pydocstyle==6.0.0 # via pylama
pyflakes==2.3.0 # via -r ./test.txt, flake8, pylama
pygments==2.8.1 # via -r ./test.txt, ipython
pylama==7.7.1 # via -r dev.in
pylint==2.5.3 # via -r dev.in
pylint==2.7.2 # via -r dev.in
pyparsing==2.4.7 # via -r ./test.txt, packaging
pytest-django==3.9.0 # via -r ./test.txt
pytest==6.0.1 # via -r ./test.txt, pytest-django
pytest-django==4.1.0 # via -r ./test.txt
pytest==6.2.2 # via -r ./test.txt, pytest-django
python-dateutil==2.8.1 # via -r ./test.txt, arrow, faker, ics
python-ldap==3.3.1 # via -r ./test.txt, django-auth-ldap
pytz==2020.1 # via -r ./test.txt, django, django-modelcluster, l18n
requests==2.24.0 # via -r ./test.txt, wagtail
six==1.15.0 # via -r ./test.txt, astroid, django-coverage-plugin, django-modeltranslation, html5lib, ics, l18n, packaging, pip-tools, python-dateutil, traitlets
snowballstemmer==2.0.0 # via pydocstyle
soupsieve==2.0.1 # via -r ./test.txt, beautifulsoup4
sqlparse==0.3.1 # via -r ./test.txt, django, django-debug-toolbar
tablib[xls,xlsx]==2.0.0 # via -r ./test.txt, wagtail
pytz==2021.1 # via -r ./test.txt, django, django-modelcluster, l18n
requests==2.25.1 # via -r ./test.txt, wagtail
six==1.15.0 # via -r ./test.txt, django-coverage-plugin, django-modeltranslation, html5lib, ics, l18n, python-dateutil
snowballstemmer==2.1.0 # via pydocstyle
soupsieve==2.2.1 # via -r ./test.txt, beautifulsoup4
sqlparse==0.4.1 # via -r ./test.txt, django, django-debug-toolbar
tablib[xls,xlsx]==3.0.0 # via -r ./test.txt, wagtail
tatsu==4.4.0 # via -r ./test.txt, ics
text-unidecode==1.3 # via faker
toml==0.10.1 # via -r ./test.txt, pylint, pytest
traitlets==4.3.3 # via ipython
typed-ast==1.4.1 # via astroid
unidecode==1.1.1 # via -r ./test.txt, wagtail
urllib3==1.25.10 # via -r ./test.txt, requests
wagtail-modeltranslation==0.10.15 # via -r ./test.txt
wagtail==2.10 # via -r ./test.txt, wagtail-modeltranslation, wagtailvideos
toml==0.10.2 # via -r ./test.txt, ipdb, pep517, pylint, pytest
traitlets==5.0.5 # via ipython
typed-ast==1.4.2 # via astroid
typing-extensions==3.7.4.3 # via -r ./test.txt, importlib-metadata
urllib3==1.26.4 # via -r ./test.txt, requests
wagtail-modeltranslation==0.10.17 # via -r ./test.txt
wagtail==2.12.3 # via -r ./test.txt, wagtail-modeltranslation, wagtailvideos
git+https://github.com/neon-jungle/wagtailvideos@3cd93351b67c7d72a0b6b4ac74a62410d5e6bccb # via -r ./test.txt
wcwidth==0.2.5 # via prompt-toolkit
webencodings==0.5.1 # via -r ./test.txt, html5lib
willow==1.4 # via -r ./test.txt, wagtail
wrapt==1.12.1 # via astroid
xlrd==1.2.0 # via -r ./test.txt, tablib
xlsxwriter==1.3.2 # via -r ./test.txt, wagtail
xlrd==2.0.1 # via -r ./test.txt, tablib
xlsxwriter==1.3.7 # via -r ./test.txt, wagtail
xlwt==1.3.0 # via -r ./test.txt, tablib
zipp==3.1.0 # via -r ./test.txt, importlib-metadata
zipp==3.4.1 # via -r ./test.txt, importlib-metadata, pep517

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
27 changes: 13 additions & 14 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,31 @@
# pip-compile --output-file=docs.txt docs.in
#
alabaster==0.7.12 # via sphinx
babel==2.8.0 # via sphinx
certifi==2020.6.20 # via requests
chardet==3.0.4 # via requests
babel==2.9.0 # via sphinx
certifi==2020.12.5 # via requests
chardet==4.0.0 # via requests
commonmark==0.9.1 # via recommonmark
docutils==0.16 # via recommonmark, sphinx
idna==2.10 # via requests
imagesize==1.2.0 # via sphinx
jinja2==2.11.2 # via sphinx
jinja2==2.11.3 # via sphinx
markupsafe==1.1.1 # via jinja2
packaging==20.4 # via sphinx
pygments==2.6.1 # via sphinx
packaging==20.9 # via sphinx
pygments==2.8.1 # via sphinx
pyparsing==2.4.7 # via packaging
pytz==2020.1 # via babel
recommonmark==0.6.0
requests==2.24.0 # via sphinx
six==1.15.0 # via packaging
snowballstemmer==2.0.0 # via sphinx
sphinx-rtd-theme==0.5.0
sphinx==3.2.0
pytz==2021.1 # via babel
recommonmark==0.7.1 # via -r docs.in
requests==2.25.1 # via sphinx
snowballstemmer==2.1.0 # via sphinx
sphinx-rtd-theme==0.5.1 # via -r docs.in
sphinx==3.5.3 # via -r docs.in, recommonmark, sphinx-rtd-theme
sphinxcontrib-applehelp==1.0.2 # via sphinx
sphinxcontrib-devhelp==1.0.2 # via sphinx
sphinxcontrib-htmlhelp==1.0.3 # via sphinx
sphinxcontrib-jsmath==1.0.1 # via sphinx
sphinxcontrib-qthelp==1.0.3 # via sphinx
sphinxcontrib-serializinghtml==1.1.4 # via sphinx
urllib3==1.25.10 # via requests
urllib3==1.26.4 # via requests

# The following packages are considered to be unsafe in a requirements file:
# setuptools
Loading