Add cancel button for when user entry is being edited#38952
Add cancel button for when user entry is being edited#38952JeaNugroho wants to merge 4 commits intonextcloud:masterfrom
Conversation
szaimen
requested review from
a team,
nfebe and
susnux
and removed request for
a team
nimishavijay
left a comment
nimishavijay
left a comment
There was a problem hiding this comment.
Super nice! :) Only one tiny thing to nitpick: All the icons in a column should be center-aligned ideally. So the buttons should be moved slightly to the right, so that the close icon is nicely aligned with all the edit icons above it :)
nfebe
left a comment
nfebe
left a comment
There was a problem hiding this comment.
This now looks ok to me however,
- There's a review about alignment which you should address
- Update the screenshot in the description to reflect the new changes
And we would be good to go! Thank you for your contribution :)
|
This needs to be rebased as the @artonge said it was heavily modified. |
Rebase add cancel button Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>
Omit checkmark button since it has the same functionality as the cancel button - Editing User Entry Co-authored-by: F. E Noel Nfebe <fenn25.fn@gmail.com> Signed-off-by: Jean Benedict Nugroho <35510082+JeaNugroho@users.noreply.github.com>
Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>
JeaNugroho
force-pushed
the
JeaNugroho-NextCloudServer/AddCancelButton-EditingUserEntry
branch
from
2e36db2 to
d2b2fc3
Compare
|
Have just rebased! I'll try to fix the alignment and update the original commit with the new screenshot of the layout. And then when any of the required CI checks fail, I hope someone can provide guidance for that 😊 |
|
@fenn-cs @artonge @susnux |
|
@JeaNugroho you should lint and then build ideally! However there are some merge conflicts in your PR, check the files tab closely. I would leave some inline comments to help you see them. |
| <div class="icon-checkmark" /> | ||
| {{ feedbackMessage }} | ||
| </div> | ||
| >>>>>>> 7a2938b01f3 (Add cancel button for when user entry is being edited) |
There was a problem hiding this comment.
| >>>>>>> 7a2938b01f3 (Add cancel button for when user entry is being edited) |
Merge conflict, and deleting this line is not the solution though you want to work with perhaps your code editor to help you resolve the conflicts.
| </div> | ||
|
|
||
| <div class="userActions"> | ||
| <<<<<<< HEAD |
There was a problem hiding this comment.
| <<<<<<< HEAD |
Another conflict marker
| :actions="userActions" | ||
| :edit="true" | ||
| @update:edit="toggleEdit" /> | ||
| ======= |
There was a problem hiding this comment.
| ======= |
Conflict.
Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>
|
Thanks @JeaNugroho! We have some more modifications incoming, would it be fine with you if we revisit this after merging #39050 to prevent conflicts? |
|
#39050 has been merged, @JeaNugroho. So feel free to proceed. :) |
skjnldsv
added
2. developing
10 participants
Summary
Add a cancel button between checkmark button and three-dot button for when user entry is being edited.
Before
After
Potential next steps
This comment may be the next fix to make user experience more intuitive and straightforward. I personally would think that the user editing process would be like this if I were a new user to the app. I can certainly implement a way to make this happen, either in the same PR or in the next PR after this one's completed.
Checklist