diff options
| author | Unknwon <u@gogs.io> | 2015-09-02 16:18:09 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-09-02 16:18:09 -0400 |
| commit | 83dc2468f574e9cf83515e54268bdb4c03f6d98c (patch) | |
| tree | 03499c31d850c1c0e4cb063b9cc70f9c1d2a063b /templates/user | |
| parent | 842770d7fbc72789d6df885da7ec5a2d4070f25f (diff) | |
| download | gitea-83dc2468f574e9cf83515e54268bdb4c03f6d98c.tar.gz gitea-83dc2468f574e9cf83515e54268bdb4c03f6d98c.zip | |
finish initial version of pull request
Diffstat (limited to 'templates/user')
| -rw-r--r-- | templates/user/dashboard/feeds.tmpl | 5 | ||||
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/navbar.tmpl | 3 | ||||
| -rw-r--r-- | templates/user/dashboard/pulls.tmpl | 5 |
4 files changed, 9 insertions, 6 deletions
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 5c2a747024..a79ff5531b 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -25,6 +25,9 @@ {{else if eq .GetOpType 10}} {{ $index := index .GetIssueInfos 0}} {{$.i18n.Tr "action.comment_issue" .GetRepoLink $index .GetRepoPath | Str2html}} + {{else if eq .GetOpType 11}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.merge_pull_request" .GetRepoLink $index .GetRepoPath | Str2html}} {{end}} </p> {{if eq .GetOpType 5}} @@ -46,6 +49,8 @@ <p class="news-content comment-news">{{index .GetIssueInfos 1}}</p> {{else if eq .GetOpType 10}} <p class="news-content comment-news">{{index .GetIssueInfos 1}}</p> + {{else if eq .GetOpType 11}} + <p class="news-content comment-news">{{index .GetIssueInfos 1}}</p> {{end}} <p class="news-time text-italic">{{TimeSince .GetCreate $.i18n.Lang}}</p> </div> diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 5e062a3b24..1c9eb0e650 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -21,7 +21,7 @@ {{end}} <div class="ui divider"></div> {{range .Repos}} - <a class="{{if eq $.RepoID .ID}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}{{if not (eq $.RepoID .ID)}}&repo={{.ID}}{{end}}&state={{$.State}}">{{$.SignedUser.Name}}/{{.Name}} <strong class="ui right">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</strong></a> + <a class="{{if eq $.RepoID .ID}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}{{if not (eq $.RepoID .ID)}}&repo={{.ID}}{{end}}&state={{$.State}}">{{$.ContextUser.Name}}/{{.Name}} <strong class="ui right">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</strong></a> {{end}} </div> </div> diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 7bca9c8107..d87f766674 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -36,6 +36,9 @@ <a class="{{if .PageIsIssues}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/issues"> <i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "issues"}} </a> + <a class="{{if .PageIsPulls}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/pulls"> + <i class="octicon octicon-git-pull-request"></i> {{.i18n.Tr "pull_requests"}} + </a> <div class="right menu"> <div class="item"> <a class="ui blue basic button" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}"> diff --git a/templates/user/dashboard/pulls.tmpl b/templates/user/dashboard/pulls.tmpl deleted file mode 100644 index 9a03684250..0000000000 --- a/templates/user/dashboard/pulls.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -{{template "user/dashboard/nav" .}} - -{{template "ng/base/footer" .}}
\ No newline at end of file |