Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add styling and embedding tools for FlatPages content (refs #3921, #3922, #4019) #4020

Merged
merged 2 commits into from
Apr 2, 2024

Conversation

marcantoinedupre
Copy link
Contributor

@marcantoinedupre marcantoinedupre commented Mar 28, 2024

Description

The following styling possibilities have been added:

  • a blockquote section
  • an information section
  • multiple heading levels (from H2 to H6)

Added embedding tools :

  • decorated link with a button style (from tool "Lien Bouton")
  • the "Suggestions" tool allow to embed an element referencing Geotrek objects (available categories: treks, touristic content, touristic event, outdoor site). It takes the form of an invisible DIV in the HTML content which can be retrieved through the API and displayed nicely (with cards in an article for instance).

Related Issue

Checklist

  • I have followed the guidelines in our Contributing document
  • My code respects the Definition of done available in the Development section of the documentation
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes
  • I added an entry in the changelog file
  • My commits are all using prefix convention (emoji + tag name) and references associated issues
  • I added a label to the PR corresponding to the perimeter of my contribution
  • The title of my PR mentionned the issue associated

Copy link

cypress bot commented Mar 28, 2024

Passing run #8586 ↗︎

0 24 0 0 Flakiness 0

Details:

Merge fbfd825 into 5af975e...
Project: Geotrek-admin Commit: cec871f0a5 ℹ️
Status: Passed Duration: 02:15 💡
Started: Apr 2, 2024 3:27 PM Ended: Apr 2, 2024 3:29 PM

Review all test suite changes for PR #4020 ↗︎

@marcantoinedupre marcantoinedupre force-pushed the feat_add_tools_for_flatpages_content branch from a5a92a3 to 6f88173 Compare March 28, 2024 08:59
Copy link

codecov bot commented Mar 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.41%. Comparing base (5af975e) to head (fbfd825).

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #4020   +/-   ##
=======================================
  Coverage   98.40%   98.41%           
=======================================
  Files         281      282    +1     
  Lines       20746    20757   +11     
=======================================
+ Hits        20416    20427   +11     
  Misses        330      330           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@marcantoinedupre marcantoinedupre force-pushed the feat_add_menus_for_flat_pages branch 4 times, most recently from 2b56ac7 to fb05a09 Compare April 1, 2024 22:20
@marcantoinedupre marcantoinedupre force-pushed the feat_add_tools_for_flatpages_content branch from 20ab020 to f4bb7fc Compare April 1, 2024 22:45
@marcantoinedupre marcantoinedupre force-pushed the feat_add_tools_for_flatpages_content branch from f4bb7fc to 05b5d1d Compare April 1, 2024 22:58
@marcantoinedupre marcantoinedupre changed the title Add styling and embedding tools for FlatPages content Add styling and embedding tools for FlatPages content (refs #3921, #3922, #4019) Apr 1, 2024
@marcantoinedupre marcantoinedupre marked this pull request as ready for review April 1, 2024 23:30
geotrek/settings/base.py Outdated Show resolved Hide resolved
@marcantoinedupre marcantoinedupre force-pushed the feat_add_tools_for_flatpages_content branch from aabfa7a to 15e1368 Compare April 2, 2024 14:38
@marcantoinedupre marcantoinedupre force-pushed the feat_add_menus_for_flat_pages branch 2 times, most recently from b1a759a to d7890a4 Compare April 2, 2024 15:09
Base automatically changed from feat_add_menus_for_flat_pages to master April 2, 2024 15:09
#3921, #3922, #4019)

Issues:

- [[PageStatiqueV2] Proposer des styles prédéfinis #3921](#3921)
- [[PageStatiqueV2] Alignement des images #3922](#3922)
- [Intégration composant "Suggestions" #4019](#4019)

The following styling possibilities have been added:

- a blockquote section
- an information section
- multiple heading levels (from H2 to H6)

Added embedding tools :

- decorated link with a button style (from tool "Lien Bouton")
- the "Suggestions" tool allow to embed an element referencing Geotrek objects (available categories: treks, touristic content, touristic event, outdoor site). It takes the form of an invisible DIV in the HTML content which can be retrieved through the API and displayed nicely (with cards in an article for instance).

It also removes static files from the previously used `youtube` tinymce plugin which is not compatible with TinyMCE 5.
Indicates the version Geotrek-rando has to be upgraded to before upgrading Geotrek-admin.
@marcantoinedupre marcantoinedupre force-pushed the feat_add_tools_for_flatpages_content branch from 15e1368 to fbfd825 Compare April 2, 2024 15:15
@marcantoinedupre marcantoinedupre merged commit a66550d into master Apr 2, 2024
16 checks passed
@marcantoinedupre marcantoinedupre deleted the feat_add_tools_for_flatpages_content branch April 2, 2024 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants