diff options
Diffstat (limited to 'templates/repo')
| -rw-r--r-- | templates/repo/issue/view_content/comments.tmpl | 33 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/sidebar.tmpl | 137 | ||||
| -rw-r--r-- | templates/repo/settings/options.tmpl | 6 |
3 files changed, 173 insertions, 3 deletions
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 4f185e4ae6..6a8cd1dacb 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -1,7 +1,7 @@ {{range .Issue.Comments}} {{ $createdStr:= TimeSinceUnix .CreatedUnix $.Lang }} - <!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF, 5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING, 13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE, 18 = REMOVED_DEADLINE --> + <!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF, 5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING, 13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE, 18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY --> {{if eq .Type 0}} <div class="comment" id="{{.HashTag}}"> <a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}> @@ -65,7 +65,6 @@ {{end}} </div> </div> - {{else if eq .Type 1}} <div class="event"> <span class="octicon octicon-primitive-dot"></span> @@ -233,5 +232,33 @@ {{$.i18n.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}} </span> </div> - {{end}} + {{else if eq .Type 19}} + <div class="event"> + <span class="octicon octicon-primitive-dot"></span> + <a class="ui avatar image" href="{{.Poster.HomeLink}}"> + <img src="{{.Poster.RelAvatarLink}}"> + </a> + <span class="text grey"> + {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}} + </span> + <div class="detail"> + <span class="octicon octicon-plus"></span> + <span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span> + </div> + </div> + {{else if eq .Type 20}} + <div class="event"> + <span class="octicon octicon-primitive-dot"></span> + <a class="ui avatar image" href="{{.Poster.HomeLink}}"> + <img src="{{.Poster.RelAvatarLink}}"> + </a> + <span class="text grey"> + {{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}} + </span> + <div class="detail"> + <span class="text grey octicon octicon-trashcan"></span> + <span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span> + </div> + </div> + {{end}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 11552d08d0..606ac303e6 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -249,5 +249,142 @@ </div> {{end}} </div> + + {{if .Repository.IsDependenciesEnabled}} + <div class="ui divider"></div> + + <div class="ui depending"> + <span class="text"><strong>{{.i18n.Tr "repo.issues.dependency.title"}}</strong></span> + <br> + {{if .BlockedByDependencies}} + <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"}}: + </span> + <div class="ui relaxed divided list"> + {{range .BlockedByDependencies}} + <div class="item"> + <div class="right floated content"> + {{if $.CanCreateIssueDependencies}} + <a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blockedBy');"> + <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}} + <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"}}: + </span> + <div class="ui relaxed divided list"> + {{range .BlockingDependencies}} + <div class="item"> + <div class="right floated content"> + {{if $.CanCreateIssueDependencies}} + <a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blocking');"> + <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"> + {{$.CsrfTokenHtml}} + <div class="ui fluid action input"> + <div class="ui search selection dropdown new-dependency-drop-list" style="min-width: 13.9rem;border-radius: 4px 0 0 4px;border-right: 0;white-space: nowrap;"> + <input name="newDependency" type="hidden"> + <i class="dropdown icon"></i> + <input type="text" class="search"> + <div class="default text">{{.i18n.Tr "repo.issues.dependency.add"}}</div> + </div> + <button class="ui green icon button"> + <i class="plus icon"></i> + </button> + </div> + </form> + </div> + {{end}} + </div> </div> </div> +{{if .CanCreateIssueDependencies}} + <input type="hidden" id="repolink" value="{{$.RepoLink}}"> + <!-- I know, there is probably a better way to do this --> + <input type="hidden" id="issueIndex" value="{{.Issue.Index}}"/> + + <div class="ui basic modal remove-dependency"> + <div class="ui icon header"> + <i class="trash icon"></i> + {{.i18n.Tr "repo.issues.dependency.remove_header"}} + </div> + <div class="content"> + <form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/dependency/delete" id="removeDependencyForm"> + {{$.CsrfTokenHtml}} + <input type="hidden" value="" name="removeDependencyID" id="removeDependencyID"/> + <input type="hidden" value="" name="dependencyType" id="dependencyType"/> + </form> + <p>{{if .Issue.IsPull}} + {{.i18n.Tr "repo.issues.dependency.pr_remove_text"}} + {{else}} + {{.i18n.Tr "repo.issues.dependency.issue_remove_text"}} + {{end}}</p> + </div> + <div class="actions"> + <div class="ui basic red cancel inverted button"> + <i class="remove icon"></i> + {{.i18n.Tr "repo.issues.dependency.cancel"}} + </div> + <div class="ui basic green ok inverted button"> + <i class="checkmark icon"></i> + {{.i18n.Tr "repo.issues.dependency.remove"}} + </div> + </div> + </div> +{{end}} + {{end}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index aa6a76dbf4..744fa82062 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -153,6 +153,12 @@ </div> </div> {{end}} + <div class="field"> + <div class="ui checkbox"> + <input name="enable_issue_dependencies" type="checkbox" {{if (.Repository.IsDependenciesEnabled)}}checked{{end}}> + <label>{{.i18n.Tr "repo.issues.dependency.setting"}}</label> + </div> + </div> </div> <div class="field"> <div class="ui radio checkbox"> |