diff options
| author | Lauris BH <lauris@nix.lv> | 2018-09-07 05:32:46 +0300 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2018-09-07 10:32:46 +0800 |
| commit | fab7937c62f418c0170770290b491df0e8886e08 (patch) | |
| tree | 0035b57717dd6a8b907f36d90f63c52e45c38fe3 /templates | |
| parent | fa4663e61e39f0cef225ea92235a16e7da977b08 (diff) | |
| download | gitea-fab7937c62f418c0170770290b491df0e8886e08.tar.gz gitea-fab7937c62f418c0170770290b491df0e8886e08.zip | |
Improve dependency UI (#4503)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/issue/view_content/sidebar.tmpl | 88 |
1 files changed, 36 insertions, 52 deletions
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 7ecae57447..fc4b812b21 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -254,84 +254,68 @@ <div class="ui divider"></div> <div class="ui depending"> - <span class="text"><strong>{{.i18n.Tr "repo.issues.dependency.title"}}</strong></span> - <br> - {{if .BlockedByDependencies}} + {{if (and (not .BlockedByDependencies) (not .BlockingDependencies))}} + <span class="text"><strong>{{.i18n.Tr "repo.issues.dependency.title"}}</strong></span> + <br> + <p>{{if .Issue.IsPull}} + {{.i18n.Tr "repo.issues.dependency.pr_no_dependencies"}} + {{else}} + {{.i18n.Tr "repo.issues.dependency.issue_no_dependencies"}} + {{end}}</p> + {{end}} + + {{if .BlockingDependencies}} <span class="text" data-tooltip="{{if .Issue.IsPull}} - {{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}} - {{else}} - {{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}} - {{end}}" data-inverted=""> - {{.i18n.Tr "repo.issues.dependency.blocked_by_short"}}: + {{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}} + {{else}} + {{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}} + {{end}}" data-inverted=""> + <strong>{{.i18n.Tr "repo.issues.dependency.blocks_short"}}</strong> </span> <div class="ui relaxed divided list"> - {{range .BlockedByDependencies}} - <div class="item"> - <div class="right floated content"> + {{range .BlockingDependencies}} + <div class="item{{if .IsClosed}} is-closed{{end}}"> + <div class="ui black label">#{{.Index}}</div> + <a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a> + <div class="ui transparent label right floated"> {{if $.CanCreateIssueDependencies}} - <a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blockedBy');"> + <a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blocking');" + data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted=""> <i class="delete icon text red"></i> </a> {{end}} - {{if .IsClosed}} - <div class="ui red mini label"> - <i class="octicon octicon-issue-closed"></i> - </div> - {{else}} - <div class="ui green mini label"> - <i class="octicon octicon-issue-opened"></i> - </div> - {{end}} </div> - <div class="ui black label">#{{.Index}}</div> - <a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a> </div> {{end}} </div> {{end}} - {{if .BlockingDependencies}} + {{if .BlockedByDependencies}} <span class="text" data-tooltip="{{if .Issue.IsPull}} - {{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}} - {{else}} - {{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}} - {{end}}" data-inverted=""> - {{.i18n.Tr "repo.issues.dependency.blocks_short"}}: + {{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}} + {{else}} + {{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}} + {{end}}" data-inverted=""> + <strong>{{.i18n.Tr "repo.issues.dependency.blocked_by_short"}}</strong> </span> <div class="ui relaxed divided list"> - {{range .BlockingDependencies}} - <div class="item"> - <div class="right floated content"> + {{range .BlockedByDependencies}} + <div class="item{{if .IsClosed}} is-closed{{end}}"> + <div class="ui black label">#{{.Index}}</div> + <a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a> + <div class="ui transparent label right floated"> {{if $.CanCreateIssueDependencies}} - <a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blocking');"> + <a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blockedBy');" + data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted=""> <i class="delete icon text red"></i> </a> {{end}} - {{if .IsClosed}} - <div class="ui red tiny label"> - <i class="octicon octicon-issue-closed"></i> - </div> - {{else}} - <div class="ui green mini label"> - <i class="octicon octicon-issue-opened"></i> - </div> - {{end}} </div> - <div class="ui black label">#{{.Index}}</div> - <a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a> </div> {{end}} </div> {{end}} - {{if (and (not .BlockedByDependencies) (not .BlockingDependencies))}} - <p>{{if .Issue.IsPull}} - {{.i18n.Tr "repo.issues.dependency.pr_no_dependencies"}} - {{else}} - {{.i18n.Tr "repo.issues.dependency.issue_no_dependencies"}} - {{end}}</p> - {{end}} - {{if .CanCreateIssueDependencies}} <div> <form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/dependency/add" id="addDependencyForm"> |