diff options
Diffstat (limited to 'templates/repo')
-rw-r--r-- | templates/repo/branch/list.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/commit_page.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/editor/edit.tmpl | 6 | ||||
-rw-r--r-- | templates/repo/editor/patch.tmpl | 6 | ||||
-rw-r--r-- | templates/repo/issue/labels/edit_delete_label.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/issue/milestones.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/issue/view_content.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/issue/view_content/sidebar.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/projects/list.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/projects/view.tmpl | 10 | ||||
-rw-r--r-- | templates/repo/release/list.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/release/new.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/settings/branches.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/settings/collaboration.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/settings/deploy_keys.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/settings/lfs.tmpl | 8 | ||||
-rw-r--r-- | templates/repo/settings/options.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/settings/webhook/delete_modal.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/wiki/view.tmpl | 2 |
19 files changed, 29 insertions, 33 deletions
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 98862bfd8e..b027c175a4 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -147,7 +147,7 @@ </div> </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.branch.delete_html"}} <span class="name"></span> diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 00e6220c3e..5e26c04fd8 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -59,7 +59,7 @@ 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 gitea-confirm-modal modal" id="cherry-pick-modal"> + <div class="ui g-modal-confirm modal" id="cherry-pick-modal"> <div class="header"> <span id="cherry-pick-header"></span> </div> diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 1c0682f4d5..fe0bd46635 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -56,7 +56,7 @@ </div> - <div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal"> + <div class="ui g-modal-confirm modal" id="edit-empty-content-modal"> <div class="header"> {{svg "octicon-file"}} {{.locale.Tr "repo.editor.commit_empty_file_header"}} @@ -65,11 +65,11 @@ <p>{{.locale.Tr "repo.editor.commit_empty_file_text"}}</p> </div> <div class="actions"> - <button class="ui red basic cancel inverted button"> + <button class="ui red cancel button"> {{svg "octicon-x"}} {{.locale.Tr "repo.editor.cancel"}} </button> - <button class="ui green basic ok inverted button"> + <button class="ui green ok button"> {{svg "fontawesome-save"}} {{.locale.Tr "repo.editor.commit_changes"}} </button> diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl index a211187d06..99c13c1fc5 100644 --- a/templates/repo/editor/patch.tmpl +++ b/templates/repo/editor/patch.tmpl @@ -36,7 +36,7 @@ </form> </div> - <div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal"> + <div class="ui g-modal-confirm modal" id="edit-empty-content-modal"> <div class="header"> {{svg "octicon-file"}} {{.locale.Tr "repo.editor.commit_empty_file_header"}} @@ -45,11 +45,11 @@ <p>{{.locale.Tr "repo.editor.commit_empty_file_text"}}</p> </div> <div class="actions"> - <button class="ui red basic inverted cancel button"> + <button class="ui red cancel button"> {{svg "octicon-x"}} {{.locale.Tr "repo.editor.cancel"}} </button> - <button class="ui green basic inverted ok button"> + <button class="ui green ok button"> {{svg "fontawesome-save"}} {{.locale.Tr "repo.editor.commit_changes"}} </button> diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index 32e5a140ae..458250f92b 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -1,4 +1,4 @@ -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.issues.label_deletion"}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 7abb1a6606..b2428237a0 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -116,7 +116,7 @@ </div> {{if or .CanWriteIssues .CanWritePulls}} - <div class="ui gitea-confirm-modal delete modal"> + <div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.milestones.deletion"}} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 8112373f06..7d3bce2b6a 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -197,7 +197,7 @@ <span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span> </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.branch.delete" .HeadTarget}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index a8ca0331c7..248fc71b06 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -542,7 +542,7 @@ {{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}} <input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}"> - <div class="ui gitea-confirm-modal modal remove-dependency"> + <div class="ui g-modal-confirm modal remove-dependency"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.issues.dependency.remove_header"}} @@ -656,7 +656,7 @@ {{svg "octicon-trash"}} {{.locale.Tr "repo.issues.delete"}} </button> - <div class="ui gitea-confirm-modal modal" id="delete"> + <div class="ui g-modal-confirm modal" id="delete"> <div class="header"> {{if .Issue.IsPull}} {{.locale.Tr "repo.pulls.delete.title"}} diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index ebe6008bba..5fd1466331 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -78,7 +78,7 @@ </div> {{if .CanWriteProjects}} -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.projects.deletion"}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index df880591b7..fa98d2eeba 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -156,17 +156,17 @@ </div> </div> - <div class="ui gitea-confirm-modal modal default-project-board-modal" id="default-project-board-modal-{{.ID}}"> + <div class="ui g-modal-confirm 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"> <label id="default-project-board-content"></label> </div> - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}} + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} </div> - <div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}"> + <div class="ui g-modal-confirm modal" id="delete-board-modal-{{.ID}}"> <div class="header"> {{$.locale.Tr "repo.projects.column.delete"}} </div> @@ -175,7 +175,7 @@ {{$.locale.Tr "repo.projects.column.deletion_desc"}} </label> </div> - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}} + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} </div> </div> </div> @@ -278,7 +278,7 @@ </div> {{if .CanWriteProjects}} - <div class="ui gitea-confirm-modal delete modal"> + <div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.projects.deletion"}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 1ddb479317..d0e3b9cc07 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -184,7 +184,7 @@ </div> {{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}} - <div class="ui gitea-confirm-modal delete modal"> + <div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.release.delete_tag"}} diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index de5946fe68..fe8a6cfc55 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -138,7 +138,7 @@ </div> {{if .PageIsEditRelease}} - <div class="ui gitea-confirm-modal delete modal"> + <div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.release.deletion"}} diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index ae1d7277a1..f74a2a837d 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -91,7 +91,7 @@ {{end}} </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.settings.protected_branch_deletion"}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 82696612f8..66448da0c5 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -107,7 +107,7 @@ {{end}} </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.settings.collaborator_deletion"}} diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 584a6ee1a6..caf049acd6 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -72,7 +72,7 @@ </div> </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.settings.deploy_key_deletion"}} diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl index 3a39dff62c..4d469a364e 100644 --- a/templates/repo/settings/lfs.tmpl +++ b/templates/repo/settings/lfs.tmpl @@ -36,7 +36,7 @@ </table> {{template "base/paginate" .}} {{range .LFSFiles}} - <div class="ui gitea-confirm-modal modal" id="delete-{{.Oid}}"> + <div class="ui g-modal-confirm modal" id="delete-{{.Oid}}"> <div class="header"> {{$.locale.Tr "repo.settings.lfs_delete" .Oid}} </div> @@ -46,14 +46,10 @@ </p> <form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post"> {{$.CsrfTokenHtml}} - <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> + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}} </form> </div> </div> {{end}} </div> -</div> {{template "repo/settings/layout_footer" .}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 0f69dac53c..dba554a3d3 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -963,7 +963,7 @@ {{end}} {{if not .Repository.IsMirror}} - <div class="ui gitea-confirm-modal modal" id="archive-repo-modal"> + <div class="ui g-modal-confirm modal" id="archive-repo-modal"> <div class="header"> {{if .Repository.IsArchived}} {{.locale.Tr "repo.settings.unarchive.header"}} diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl index 209e39a96b..b78e69e6f4 100644 --- a/templates/repo/settings/webhook/delete_modal.tmpl +++ b/templates/repo/settings/webhook/delete_modal.tmpl @@ -1,4 +1,4 @@ -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.settings.webhook_deletion"}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 74e4090b9a..b892bff947 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -99,7 +99,7 @@ </div> </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.wiki.delete_page_button"}} |