loading up the forgejo repo on tangled to test page performance
Merge pull request 'Improve git notes UI' (#6025) from 0ko/forgejo:ui-notes-followup into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6025
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
+9
-8
+3
-3
options/locale/locale_en-US.ini
+3
-3
options/locale/locale_en-US.ini
···
2622
2622
diff.parent = parent
2623
2623
diff.commit = commit
2624
2624
diff.git-notes = Notes
2625
-
diff.git-notes.add = Add Note
2626
-
diff.git-notes.remove-header = Remove Note
2627
-
diff.git-notes.remove-body = This will remove this Note
2625
+
diff.git-notes.add = Add note
2626
+
diff.git-notes.remove-header = Remove note
2627
+
diff.git-notes.remove-body = This note will be removed.
2628
2628
diff.data_not_available = Diff content is not available
2629
2629
diff.options_button = Diff options
2630
2630
diff.show_diff_stats = Show stats
+6
-4
templates/repo/commit_page.tmpl
+6
-4
templates/repo/commit_page.tmpl
···
128
128
</form>
129
129
</div>
130
130
</div>
131
+
<div id="commit-notes-add-button" class="item">
132
+
{{ctx.Locale.Tr "repo.diff.git-notes.add"}}
133
+
</div>
131
134
</div>
132
135
</div>
133
136
{{end}}
···
277
280
<span class="text grey" id="note-authored-time">{{DateUtils.TimeSince .NoteCommit.Author.When}}</span>
278
281
{{if or ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}
279
282
<div class="ui right">
280
-
<button id="commit-notes-edit-button" class="ui tiny button yellow" data-modal="#delete-note-modal">{{ctx.Locale.Tr "edit"}}</button>
283
+
<button id="commit-notes-edit-button" class="ui tiny primary button" data-modal="#delete-note-modal">{{ctx.Locale.Tr "edit"}}</button>
281
284
<button class="ui tiny button red show-modal" data-modal="#delete-note-modal">{{ctx.Locale.Tr "remove"}}</button>
282
285
</div>
283
286
<div class="ui small modal" id="delete-note-modal">
284
287
<div class="header">
285
288
{{ctx.Locale.Tr "repo.diff.git-notes.remove-header"}}
286
289
</div>
287
-
<p>{{ctx.Locale.Tr "repo.diff.git-notes.remove-body"}}</p>
288
290
<div class="content">
291
+
<p>{{ctx.Locale.Tr "repo.diff.git-notes.remove-body"}}</p>
289
292
<div class="text right actions">
290
293
<form action="{{.Link}}/notes/remove" method="post">
291
294
{{.CsrfTokenHtml}}
292
295
<button type="button" class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
293
-
<button type="submit" class="ui primary button red" href="{{.Link}}/notes/remove">{{ctx.Locale.Tr "remove"}}</button>
296
+
<button type="submit" class="ui red button" href="{{.Link}}/notes/remove">{{ctx.Locale.Tr "remove"}}</button>
294
297
</form>
295
298
</div>
296
299
</div>
···
316
319
</div>
317
320
{{end}}
318
321
{{else if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}
319
-
<button id="commit-notes-add-button" class="ui primary button green tw-mt-3">{{ctx.Locale.Tr "repo.diff.git-notes.add"}}</button>
320
322
<div id="commit-notes-add-area" class="ui tw-mt-3 segment tw-hidden">
321
323
<form class="ui form" action="{{.Link}}/notes" method="post">
322
324
{{.CsrfTokenHtml}}
-1
web_src/js/features/repo-commit.js
-1
web_src/js/features/repo-commit.js
···
38
38
const notesAddButton = document.getElementById('commit-notes-add-button');
39
39
if (notesAddButton !== null) {
40
40
notesAddButton.addEventListener('click', () => {
41
-
notesAddButton.classList.add('tw-hidden');
42
41
document.getElementById('commit-notes-add-area').classList.remove('tw-hidden');
43
42
});
44
43
}