summaryrefslogtreecommitdiffstats
path: root/templates/repo
diff options
context:
space:
mode:
authorJimmy Praet <jimmy.praet@telenet.be>2021-05-27 22:02:04 +0200
committerGitHub <noreply@github.com>2021-05-27 22:02:04 +0200
commitc9480c5f606e1e83f8f9c373052c0ba758bf300b (patch)
treead1897aefa7a8b727c673f9f742dbfe26d05edd9 /templates/repo
parent6d6a65cf5cc13deddd96bb76b773667d068823d4 (diff)
downloadgitea-c9480c5f606e1e83f8f9c373052c0ba758bf300b.tar.gz
gitea-c9480c5f606e1e83f8f9c373052c0ba758bf300b.zip
Add links to toggle WIP status (#14677)
* Add links to toggle PR WIP status * Allow PR author to toggle WIP status * refactors and restyling, remove links from translations Co-authored-by: Norwin <noerw@users.noreply.github.com> Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'templates/repo')
-rw-r--r--templates/repo/issue/view_content/pull.tmpl53
-rw-r--r--templates/repo/issue/view_content/sidebar.tmpl7
2 files changed, 40 insertions, 20 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 69462797a2..3bdec4becb 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -13,7 +13,7 @@
{{avatar .User}}
</a>
{{end}}
- <span class="text grey">
+ <span>
{{if .User}}
<a href="{{.User.HomeLink}}">{{.User.GetDisplayName}}</a>
{{else if .Team}}
@@ -39,7 +39,7 @@
</span>
{{end}}
{{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed))}}
- <a href="#" class="ui grey poping up icon dismiss-review-btn" data-review-id="dismiss-review-{{.Review.ID}}" data-content="{{$.i18n.Tr "repo.issues.dismiss_review"}}">
+ <a href="#" class="ui muted poping up icon dismiss-review-btn" data-review-id="dismiss-review-{{.Review.ID}}" data-content="{{$.i18n.Tr "repo.issues.dismiss_review"}}">
{{svg "octicon-x" 16}}
</a>
<div class="ui small modal" id="dismiss-review-modal">
@@ -172,9 +172,18 @@
{{$.i18n.Tr "repo.pulls.data_broken"}}
</div>
{{else if .IsPullWorkInProgress}}
- <div class="item">
- <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
- {{$.i18n.Tr "repo.pulls.cannot_merge_work_in_progress" (.WorkInProgressPrefix|Escape) | Str2html}}
+ <div class="item toggle-wip df ac sb" data-title="{{.Issue.Title}}" data-wip-prefix="{{(.WorkInProgressPrefix|Escape)}}" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/title">
+ <div>
+ <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
+ {{$.i18n.Tr "repo.pulls.cannot_merge_work_in_progress" }}
+ </div>
+ <div>
+ {{if or .HasIssuesOrPullsWritePermission .IsIssuePoster}}
+ <button class="ui compact button">
+ {{$.i18n.Tr "repo.pulls.remove_prefix" (.WorkInProgressPrefix|Escape) | Safe}}
+ </button>
+ {{end}}
+ </div>
</div>
{{else if .Issue.PullRequest.IsChecking}}
<div class="item">
@@ -182,7 +191,7 @@
{{$.i18n.Tr "repo.pulls.is_checking"}}
</div>
{{else if .Issue.PullRequest.IsEmpty}}
- <div class="item text grey">
+ <div class="item">
<i class="icon icon-octicon">{{svg "octicon-alert" 16}}</i>
{{$.i18n.Tr "repo.pulls.is_empty"}}
</div>
@@ -443,14 +452,14 @@
{{svg "octicon-x"}}
{{$.i18n.Tr "repo.pulls.no_merge_desc"}}
</div>
- <div class="item text grey">
+ <div class="item">
{{svg "octicon-info"}}
{{$.i18n.Tr "repo.pulls.no_merge_helper"}}
</div>
{{end}}
{{else}}
<div class="ui divider"></div>
- <div class="item text grey">
+ <div class="item">
{{svg "octicon-info"}}
{{$.i18n.Tr "repo.pulls.no_merge_access"}}
</div>
@@ -503,7 +512,7 @@
{{svg "octicon-x"}}
{{$.i18n.Tr "repo.pulls.cannot_auto_merge_desc"}}
</div>
- <div class="item text grey">
+ <div class="item">
{{svg "octicon-info"}}
{{$.i18n.Tr "repo.pulls.cannot_auto_merge_helper"}}
</div>
@@ -511,17 +520,21 @@
{{end}}
{{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}}
- <div class="item text grey">
- <i class="icon icon-octicon">{{svg "octicon-alert"}}</i>
- {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}}
- {{if .UpdateAllowed}}
- <form action="{{.Link}}/update" method="post" class="ui floating right">
- {{.CsrfTokenHtml}}
- <button class="ui compact button" data-do="update">
- <span class="ui text">{{$.i18n.Tr "repo.pulls.update_branch"}}</span>
- </button>
- </form>
- {{end}}
+ <div class="item df ac sb">
+ <div>
+ <i class="icon icon-octicon">{{svg "octicon-alert"}}</i>
+ {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}}
+ </div>
+ <div>
+ {{if .UpdateAllowed}}
+ <form action="{{.Link}}/update" method="post">
+ {{.CsrfTokenHtml}}
+ <button class="ui compact button" data-do="update">
+ <span class="ui text">{{$.i18n.Tr "repo.pulls.update_branch"}}</span>
+ </button>
+ </form>
+ {{end}}
+ </div>
</div>
{{end}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index e3530fc45b..2f42957266 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -91,6 +91,13 @@
{{end}}
</div>
</div>
+ {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .HasMerged) (not .Issue.IsClosed) (not .IsPullWorkInProgress)}}
+ <div class="toggle-wip" data-title="{{.Issue.Title}}" data-wip-prefix="{{(index .PullRequestWorkInProgressPrefixes 0| Escape)}}" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/title">
+ <a class="muted">
+ {{.i18n.Tr "repo.pulls.still_in_progress"}} {{.i18n.Tr "repo.pulls.add_prefix" (index .PullRequestWorkInProgressPrefixes 0| Escape) | Safe}}
+ </a>
+ </div>
+ {{end}}
<div class="ui divider"></div>
{{end}}