Skip to content

Commit

Permalink
refactor(revisions): minor ux improvements
Browse files Browse the repository at this point in the history
fix #232
- put content in scrollable div, so that user can see info all the time
- change button position
- show close button
- move edited info below title
  • Loading branch information
BreadGenie committed May 2, 2024
1 parent 30a00e4 commit 8435daf
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 12 deletions.
12 changes: 10 additions & 2 deletions wiki/public/scss/wiki.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1288,11 +1288,17 @@ p {
display: none;
}

.revision-content {
height: 500px;
overflow-y: auto;
}


.modal-header {
position: inherit;

.close {
margin-top: -2.5rem;
.modal-title {
max-width: 100%;
}
}

Expand All @@ -1308,10 +1314,12 @@ p {
position: inherit;

.previous-revision {
width: inherit;
margin-right: auto;
}

.next-revision {
width: inherit;
margin-left: auto;
}
}
Expand Down
25 changes: 15 additions & 10 deletions wiki/wiki/doctype/wiki_page/templates/revisions.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
<div class="modal revisions-modal fade" id="revisionsModal" tabindex="-1" role="dialog"
aria-labelledby="revisionsModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-dialog modal-lg modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title revision-title" id="revisionsModalTitle">{{ title }}</h5>
<button type="button" class="d-block d-sm-none close" data-dismiss="modal" aria-label="Close">
<div class="d-flex flex-column">
<h5 class="modal-title revision-title" id="revisionsModalTitle">{{ title }}</h5>
<span class="small text-muted revision-time">{{ current_revision.raised_by_username or
current_revision.raised_by or
current_revision.owner }} edited {{
frappe.utils.pretty_date(current_revision.creation) }}</span>
</div>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<span class="small text-muted revision-time">{{ current_revision.raised_by_username or current_revision.raised_by or
current_revision.owner }} edited {{
frappe.utils.pretty_date(current_revision.creation) }}</span>
</div>
<div class="modal-body">
<div class="revision-content wiki-content">
{{ frappe.utils.md_to_html(previous_revision.content) }}
</div>
</div>
<div class="modal-footer">
<button type="button" data-modal-button="previous" class="previous-revision btn btn-secondary btn-sm hide">Previous</button>
<button type="button" data-modal-button="next" class="next-revision btn btn-secondary btn-sm hide">Next</button>
<div class="modal-footer d-flex justify-content-between">
<button type="button" data-modal-button="previous"
class="previous-revision btn btn-secondary btn-sm hide">Previous</button>
<button type="button" data-modal-button="next"
class="next-revision btn btn-secondary btn-sm hide">Next</button>
</div>
</div>
</div>
</div>
</div>

0 comments on commit 8435daf

Please sign in to comment.