diff options
Diffstat (limited to 'templates/repo')
21 files changed, 78 insertions, 94 deletions
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 6dd6aecb37..98862bfd8e 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -147,15 +147,15 @@ </div> </div> -<div class="ui small basic delete modal"> - <div class="ui icon header"> +<div class="ui gitea-confirm-modal delete modal"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.branch.delete_html"}} <span class="name"></span> </div> <div class="content"> <p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> <div class="ui small modal" id="create-branch-modal"> diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 8d72cd1420..00e6220c3e 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -59,11 +59,11 @@ data-modal-cherry-pick-header="{{$.locale.Tr "repo.commit.cherry-pick-header" (ShortSha .CommitID)}}" data-modal-cherry-pick-content="{{$.locale.Tr "repo.commit.cherry-pick-content"}}" data-modal-cherry-pick-submit="{{.locale.Tr "repo.commit.cherry-pick"}}">{{.locale.Tr "repo.commit.cherry-pick"}}</div> - <div class="ui basic modal" id="cherry-pick-modal"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal modal" id="cherry-pick-modal"> + <div class="header"> <span id="cherry-pick-header"></span> </div> - <div class="content center"> + <div class="content"> <p id="cherry-pick-content" class="branch-dropdown"></p> {{template "repo/branch_dropdown" dict "root" . "noTag" true "disableCreateBranch" true diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 0ac6e93d49..1c0682f4d5 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -56,8 +56,8 @@ </div> - <div class="ui small basic modal" id="edit-empty-content-modal"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal"> + <div class="header"> {{svg "octicon-file"}} {{.locale.Tr "repo.editor.commit_empty_file_header"}} </div> diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl index 97637027bb..a211187d06 100644 --- a/templates/repo/editor/patch.tmpl +++ b/templates/repo/editor/patch.tmpl @@ -36,8 +36,8 @@ </form> </div> - <div class="ui small basic modal" id="edit-empty-content-modal"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal"> + <div class="header"> {{svg "octicon-file"}} {{.locale.Tr "repo.editor.commit_empty_file_header"}} </div> diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index a999c73804..5f2e135b98 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -118,7 +118,6 @@ {{svg "octicon-repo-forked"}}{{$.locale.Tr "repo.fork"}} </a> <div class="ui small modal" id="fork-repo-modal"> - {{svg "octicon-x" 16 "close inside"}} <div class="header"> {{$.locale.Tr "repo.already_forked" .Name}} </div> diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index 52e586b783..32e5a140ae 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -1,12 +1,12 @@ -<div class="ui small basic delete modal"> - <div class="ui icon header"> +<div class="ui gitea-confirm-modal delete modal"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.issues.label_deletion"}} </div> <div class="content"> <p>{{.locale.Tr "repo.issues.label_deletion_desc"}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> <div class="ui small edit-label modal"> diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index e54a72714a..c07232c759 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -116,15 +116,15 @@ </div> {{if or .CanWriteIssues .CanWritePulls}} - <div class="ui small basic delete modal"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal delete modal"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.milestones.deletion"}} </div> <div class="content"> <p>{{.locale.Tr "repo.milestones.deletion_desc"}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> {{end}} {{template "base/footer" .}} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 081b7d08c6..8112373f06 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -197,13 +197,13 @@ <span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span> </div> -<div class="ui small basic delete modal"> - <div class="ui icon header"> +<div class="ui gitea-confirm-modal delete modal"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.branch.delete" .HeadTarget}} </div> <div class="content"> <p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl index a0d6b0ea05..d86cc52d3a 100644 --- a/templates/repo/issue/view_content/comments_delete_time.tmpl +++ b/templates/repo/issue/view_content/comments_delete_time.tmpl @@ -7,7 +7,7 @@ {{.ctxData.CsrfTokenHtml}} </form> <div class="header">{{.ctxData.locale.Tr "repo.issues.del_time"}}</div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> <button class="ui icon button compact mini issue-delete-time" data-id="{{.comment.Time.ID}}" data-tooltip-content="{{.ctxData.locale.Tr "repo.issues.del_time"}}"> {{svg "octicon-trash"}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 290488d9fb..bab9ff1936 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -542,8 +542,8 @@ {{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}} <input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}"> - <div class="ui basic modal remove-dependency"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal modal remove-dependency"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.issues.dependency.remove_header"}} </div> @@ -559,16 +559,9 @@ {{.locale.Tr "repo.issues.dependency.issue_remove_text"}} {{end}}</p> </div> - <div class="actions"> - <button class="ui red cancel inverted button"> - {{svg "octicon-x"}} - {{.locale.Tr "repo.issues.dependency.cancel"}} - </button> - <button class="ui green ok inverted button"> - {{svg "octicon-check"}} - {{.locale.Tr "repo.issues.dependency.remove"}} - </button> - </div> + {{$ModalButtonCancelText := .locale.Tr "repo.issues.dependency.cancel"}} + {{$ModalButtonOkText := .locale.Tr "repo.issues.dependency.remove"}} + {{template "base/modal_actions_confirm" (dict "." . "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}} </div> {{end}} {{end}} @@ -663,15 +656,15 @@ {{svg "octicon-trash"}} {{.locale.Tr "repo.issues.delete"}} </button> - <div class="ui basic modal" id="delete"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal modal" id="delete"> + <div class="header"> {{if .Issue.IsPull}} {{.locale.Tr "repo.pulls.delete.title"}} {{else}} {{.locale.Tr "repo.issues.delete.title"}} {{end}} </div> - <div class="content center"> + <div class="content"> <p> {{if .Issue.IsPull}} {{.locale.Tr "repo.pulls.delete.text"}} @@ -682,10 +675,7 @@ </div> <form action="{{.Issue.Link}}/delete" method="post"> {{.CsrfTokenHtml}} - <div class="center actions"> - <button class="ui basic cancel inverted button">{{.locale.Tr "settings.cancel"}}</button> - <button class="ui basic red inverted button">{{.locale.Tr "modal.yes"}}</button> - </div> + {{template "base/modal_actions_confirm" .}} </form> </div> {{end}} diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 8cf5d716f1..ebe6008bba 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -78,15 +78,15 @@ </div> {{if .CanWriteProjects}} -<div class="ui small basic delete modal"> - <div class="ui icon header"> +<div class="ui gitea-confirm-modal delete modal"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.projects.deletion"}} </div> <div class="content"> <p>{{.locale.Tr "repo.projects.deletion_desc"}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> {{end}} {{template "base/footer" .}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 2ad40d700a..cff78df70b 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -103,7 +103,6 @@ data-modal="#default-project-board-modal-{{.ID}}" data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}" data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}" - data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.set_default"}}" data-type="set_default" data-url="{{$.Link}}/{{.ID}}/default"> {{svg "octicon-pin"}} @@ -114,14 +113,16 @@ data-modal="#default-project-board-modal-{{.ID}}" data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}" data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}" - data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.unset_default"}}" data-type="unset_default" data-url="{{$.Link}}/{{.ID}}/unsetdefault"> {{svg "octicon-pin"}} {{$.locale.Tr "repo.projects.column.unset_default"}} </a> {{end}} - <a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}"> + <a class="item show-modal button show-delete-column-modal" + data-modal="#delete-board-modal-{{.ID}}" + data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}" + > {{svg "octicon-trash"}} {{$.locale.Tr "repo.projects.column.delete"}} </a> @@ -155,32 +156,26 @@ </div> </div> - <div class="ui basic modal default-project-board-modal" id="default-project-board-modal-{{.ID}}"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal modal default-project-board-modal" id="default-project-board-modal-{{.ID}}"> + <div class="header"> <span id="default-project-board-header"></span> </div> - <div class="content center"> + <div class="content"> <label id="default-project-board-content"></label> </div> - <div class="text right actions"> - <button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button> - <button class="ui primary button default-project-board-button" id="default-project-board-submit"></button> - </div> + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}} </div> - <div class="ui basic modal" id="delete-board-modal-{{.ID}}"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}"> + <div class="header"> {{$.locale.Tr "repo.projects.column.delete"}} </div> - <div class="content center"> + <div class="content"> <label> {{$.locale.Tr "repo.projects.column.deletion_desc"}} </label> </div> - <div class="text right actions">{{/* TODO: Convert to base/delete_modal_actions.tmpl? */}} - <button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button> - <button class="ui red button delete-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button> - </div> + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}} </div> </div> </div> @@ -283,15 +278,15 @@ </div> {{if or .CanWriteIssues .CanWritePulls}} - <div class="ui small basic delete modal"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal delete modal"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.projects.deletion"}} </div> <div class="content"> <p>{{.locale.Tr "repo.projects.deletion_desc"}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> {{end}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 8e1793a5ba..1ddb479317 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -184,15 +184,15 @@ </div> {{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}} - <div class="ui small basic delete modal"> - <div class="ui header"> - {{svg "octicon-trash" 16 "gt-mr-2"}} + <div class="ui gitea-confirm-modal delete modal"> + <div class="header"> + {{svg "octicon-trash"}} {{.locale.Tr "repo.release.delete_tag"}} </div> <div class="content"> <p>{{.locale.Tr "repo.release.deletion_tag_desc"}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> {{end}} diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index ddedfd6086..de5946fe68 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -138,15 +138,15 @@ </div> {{if .PageIsEditRelease}} - <div class="ui small basic delete modal"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal delete modal"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.release.deletion"}} </div> <div class="content"> <p>{{.locale.Tr "repo.release.deletion_desc"}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> {{end}} {{template "base/footer" .}} diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index 6e51fc7bb2..53e1b00f6f 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -96,15 +96,15 @@ </div> </div> -<div class="ui small basic delete modal"> - <div class="ui header"> - {{svg "octicon-trash" 16 "gt-mr-2"}} +<div class="ui gitea-confirm-modal delete modal"> + <div class="header"> + {{svg "octicon-trash"}} {{.locale.Tr "repo.settings.protected_branch_deletion"}} </div> <div class="content"> <p>{{.locale.Tr "repo.settings.protected_branch_deletion_desc"}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> {{template "base/footer" .}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 654bbba5d0..d9a415662e 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -112,14 +112,14 @@ </div> </div> -<div class="ui small basic delete modal"> - <div class="ui icon header"> +<div class="ui gitea-confirm-modal delete modal"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.settings.collaborator_deletion"}} </div> <div class="content"> <p>{{.locale.Tr "repo.settings.collaborator_deletion_desc"}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> {{template "base/footer" .}} diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 33f3937201..a0f802e49a 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -77,14 +77,14 @@ </div> </div> -<div class="ui small basic delete modal"> - <div class="ui icon header"> +<div class="ui gitea-confirm-modal delete modal"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.settings.deploy_key_deletion"}} </div> <div class="content"> <p>{{.locale.Tr "repo.settings.deploy_key_deletion_desc"}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> {{template "base/footer" .}} diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl index 8be28ad9ed..b4ffa1894f 100644 --- a/templates/repo/settings/lfs.tmpl +++ b/templates/repo/settings/lfs.tmpl @@ -40,17 +40,17 @@ </table> {{template "base/paginate" .}} {{range .LFSFiles}} - <div class="ui basic modal" id="delete-{{.Oid}}"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal modal" id="delete-{{.Oid}}"> + <div class="header"> {{$.locale.Tr "repo.settings.lfs_delete" .Oid}} </div> - <div class="content center"> + <div class="content"> <p> {{$.locale.Tr "repo.settings.lfs_delete_warning"}} </p> <form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post"> {{$.CsrfTokenHtml}} - <div class="center actions">{{/* TODO: Convert to base/delete_modal_actions */}} + <div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}} <button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button> <button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button> </div> diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 81c1e4759e..70850a6ea4 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -967,15 +967,15 @@ {{end}} {{if not .Repository.IsMirror}} - <div class="ui basic modal" id="archive-repo-modal"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal modal" id="archive-repo-modal"> + <div class="header"> {{if .Repository.IsArchived}} {{.locale.Tr "repo.settings.unarchive.header"}} {{else}} {{.locale.Tr "repo.settings.archive.header"}} {{end}} </div> - <div class="content center"> + <div class="content"> <p> {{if .Repository.IsArchived}} {{.locale.Tr "repo.settings.unarchive.text"}} @@ -988,7 +988,7 @@ {{.CsrfTokenHtml}} <input type="hidden" name="action" value="{{if .Repository.IsArchived}}unarchive{{else}}archive{{end}}"> <input type="hidden" name="repo_id" value="{{.Repository.ID}}"> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </form> </div> {{end}} diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl index f455899663..209e39a96b 100644 --- a/templates/repo/settings/webhook/delete_modal.tmpl +++ b/templates/repo/settings/webhook/delete_modal.tmpl @@ -1,10 +1,10 @@ -<div class="ui small basic delete modal"> - <div class="ui icon header"> +<div class="ui gitea-confirm-modal delete modal"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.settings.webhook_deletion"}} </div> <div class="content"> <p>{{.locale.Tr "repo.settings.webhook_deletion_desc"}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 123511d011..74e4090b9a 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -99,15 +99,15 @@ </div> </div> -<div class="ui small basic delete modal"> - <div class="ui icon header"> +<div class="ui gitea-confirm-modal delete modal"> + <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.wiki.delete_page_button"}} </div> <div class="content"> <p>{{.locale.Tr "repo.wiki.delete_page_notice_1" ($title|Escape) | Safe}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> {{template "base/footer" .}} |