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

EZP-26976: Add RichText xhtml5 support for thead & tfoot #1925

Merged
merged 2 commits into from
Apr 3, 2017

Conversation

andrerom
Copy link
Contributor

@andrerom andrerom commented Mar 6, 2017

Issue: https://jira.ez.no/browse/EZP-26976

Related to PlatformUI fix: ezsystems/PlatformUIBundle#817

"BC":

  • This changes xhtml5 edit & ouput formats to always return tbody in tables, and optionally also thead/tfoot if present.

Todo:

  • Could need some help to figure out how to fix docbook ezpublish.rng validation for thead / tfoot (error is cryptic, refers to completely other tags, but it only shows up when those two are added in the docbook document)

@alongosz
Copy link
Member

Fixed docbook.rng (used by ezpublish.rng) in 733eac6. RelaxNG Schema required tfoot being placed before tbody. In HTML5 it's not a requirement, so I surrounded proper validation XML with interleave which allows elements to occur in any order.

@pspanja
Copy link
Contributor

pspanja commented Mar 28, 2017

@alongosz docbook.rng is the original unmodified Docbook schema from the release. It should not be modified directly, but only through ezpublish.rng. Readme file mentions it's the original, but maybe it should also be explicit about not modifying it.

@pspanja
Copy link
Contributor

pspanja commented Mar 28, 2017

More info about it here: http://tdg.docbook.org/tdg/5.1/ch05.html

@alongosz
Copy link
Member

Readme file mentions it's the original, but maybe it should also be explicit about not modifying it.

Not really, should be obvious to everyone, my bad... :)

So, reverted it and redefined db.html.informaltable.model in ezpublish.rng with proper changes (788a8a2). Hope now this is how it should be done @pspanja

Note: I also rebased branch against master to get rid of php-cs-fixer error.

@andrerom
Copy link
Contributor Author

👍

@pspanja looks ok to you to?
review ping @Nattfarinn

@andrerom
Copy link
Contributor Author

andrerom commented Apr 3, 2017

Rebased, looks ok @alongosz ?

Copy link
Member

@alongosz alongosz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants