Django template refactor #1831
Merged
Django template refactor #1831
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…STALLED_APPS now and we can't list it twice.
…ails for the time being.
# Conflicts Resolved: # mapstory/flag/tests.py # mapstory/mapstories/models.py # mapstory/thumbnails/test_storylayer_thumbnail.py
The naming conflict was causing Editor to use the Geonode built in version of MapLoom instead of our own. Renaming these tags resolves that conflict and allows us to choose our own MapLoom in the MapStory templates. Bumped django-maploom because this commit relies on the name changes in that repository as well.
Changes in geonode require that we have a bbox that is not None when creating a thumbnail. This change ensures that we always have one during our thumbnail tests.
…eration to fail on story thumbnails.
…sed mapstory_tags.
…riting all of the geonode template functionality. Home and explore page templates working.
…ode template for layers.
…we do not yet support, modify adding the layer from a map to a story instead.
…that we don't use, change edit data to use our editor instead of the default geonode one.
This reverts commit fef4999.
…y/mapstory into django-template-refactor
…d ensure they are still functioning as intended.
…ween the header and the body content.
trepagnier
approved these changes
Dec 10, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request brings our templates back in line with core geonode templates as much as possible. All of the templates are now up to date except for the search template which we'll be working in a separate ticket. Our longstanding permissions issues as well as the anonymous edits issue is also fixed via this and additional geonode features have been enabled on the layer detail page.