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.

Sign up for GitHub

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

IBX-8418: Added drafts deletion warning to trash modal #1321

Merged
merged 16 commits into from
Nov 18, 2024
Merged

IBX-8418: Added drafts deletion warning to trash modal #1321

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9c6283b
IBX-8418: Added drafts deletion warning to trash modal
barw4 Aug 8, 2024
d21881b
IBX-8418: Fixup
barw4 Aug 9, 2024
f0e028e
IBX-8418: Refactored solution
barw4 Oct 2, 2024
18b588d
IBX-8418: Rollback
barw4 Oct 2, 2024
8bb343f
IBX-8418: Rollback
barw4 Oct 2, 2024
f52dd78
IBX-8414: Change translation domain
barw4 Oct 3, 2024
d8d90a3
IBX-8418: Update styling for trash options
barw4 Oct 24, 2024
765d7b2
Merge branch '4.6' into ibx-8418-drafts-deletion-warning-trash-modal
barw4 Oct 24, 2024
264b688
Merge remote-tracking branch 'origin/ibx-8418-drafts-deletion-warning…
barw4 Oct 25, 2024
3613e00
IBX-8418: Applied review remark
barw4 Oct 25, 2024
8b5db68
IBX-8418: CS
barw4 Oct 25, 2024
2c9bb6f
Merge remote-tracking branch 'origin/4.6' into ibx-8418-drafts-deleti…
mikadamczyk Oct 29, 2024
0c81fd6
IBX-8418: Added fix for behat tests
Nov 6, 2024
01bf828
IBX-8418: PHPStan
barw4 Nov 6, 2024
05e199c
IBX-8418: Added tmp dependency
Nov 6, 2024
d4aca5f
IBX-8418: Removed tmp dependency
Nov 6, 2024
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
5 changes: 5 additions & 0 deletions src/bundle/Resources/translations/messages.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,11 @@
<target state="new">Are you sure you want to send this Content item to Trash?</target>
<note>key: trash.modal.send_to_trash.message</note>
</trans-unit>
<trans-unit id="b107e8277d2dda6c41872a6478d99abbe9b46dc0" resname="trash.modal.send_to_trash_draft_warning.message">
<source>Sending this content item to Trash will also delete all drafts of content items that haven’t been published yet, and belong to the trashed subtree.</source>
<target state="new">Sending this content item to Trash will also delete all drafts of content items that haven’t been published yet, and belong to the trashed subtree.</target>
<note>key: trash.modal.send_to_trash_draft_warning.message</note>
</trans-unit>
<trans-unit id="bd97a738137e75de44544db1104bab3a46222791" resname="trash_asset.modal.message_body">
<source>If you wish to delete these assets too, first make sure they are not used by other content. To check, go to the asset preview and look at its content Relations in the Relations tab.</source>
<target state="new">If you wish to delete these assets too, first make sure they are not used by other content. To check, go to the asset preview and look at its content Relations in the Relations tab.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/bundle/Resources/views/themes/admin/content/modal/location_trash.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
{% endblock %}
{% block body_content %}
{{ 'trash.modal.send_to_trash.message'|trans|desc('Are you sure you want to send this Content item to Trash?') }}
<div class="ibexa-modal__trash-option">
<p class="ibexa-modal__option-label ibexa-label form-label required">
Copy link
Contributor

Choose a reason for hiding this comment

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

label with "*" as an explanation is probably not the best UX.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@dew326 Don't we have the same for Conflicts with relations and Sub-items warnings?

Copy link
Contributor

Choose a reason for hiding this comment

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

Not in this styling. The explanation is bigger and not gray.

Copy link
Contributor Author

@barw4 barw4 Aug 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Ok, should I go with a simple paragraph then? Or any other example in which any particular html elements/classes should be used?

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we should add a new "trash_option" for example: "Drafts" and there put this explanation.
This is probably for @NataliaBecla and @juskora.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @NataliaBecla, can we get your feedback on this?

Copy link

Choose a reason for hiding this comment

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

@barw4 It seems there was a misunderstanding, as I thought we had resolved everything during the meeting. I suggest we go with @dew326 suggestion to use "Draft" as the title and format the sentence "sending this content item..." in regular font as shown below.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

okay, will do, thank you

Copy link

Choose a reason for hiding this comment

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

Great @barw4 👌👍 Looks good

{{ 'trash.modal.send_to_trash_draft_warning.message'|trans|desc('Sending this content item to Trash will also delete all drafts of content items that haven’t been published yet, and belong to the trashed subtree.') }}
</p>
</div>

{% for option in form.trash_options %}
<div class="ibexa-modal__trash-option">
Expand Down
Loading