Browse Source

Merge pull request 'fix the pull page as same issue page' (#523) from fix-455 into V20211018

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/523
pull/529/head
A00老虎 3 years ago
parent
commit
33f6a43f41
3 changed files with 36 additions and 2 deletions
  1. +6
    -0
      templates/repo/issue/view.tmpl
  2. +15
    -1
      templates/repo/pulls/commits.tmpl
  3. +15
    -1
      templates/repo/pulls/files.tmpl

+ 6
- 0
templates/repo/issue/view.tmpl View File

@@ -10,6 +10,12 @@
<div class="divider"> / </div>
<div class="action section">{{.i18n.Tr "repo.issues_detail"}}</div>
</div>
{{else}}
<div class="ui large breadcrumb">
<a class="section" href="{{.RepoLink}}/issues">{{.i18n.Tr "repo.pulls"}}</a>
<div class="divider"> / </div>
<div class="action section">{{.i18n.Tr "repo.issues_detail"}}</div>
</div>
{{end}}
</div>
{{if not .Repository.IsArchived}}


+ 15
- 1
templates/repo/pulls/commits.tmpl View File

@@ -2,11 +2,25 @@
<div class="repository view issue pull commits">
{{template "repo/header" .}}
<div class="ui container">
<div class="navbar">
<!-- <div class="navbar">
{{template "repo/issue/navbar" .}}
<div class="ui right">
<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName | EscapePound}}...{{.PullRequestCtx.HeadInfo | EscapePound}}">{{.i18n.Tr "repo.pulls.new"}}</a>
</div>
</div> -->
<div class="ui two column stackable grid">
<div class="column" style="display: flex;align-items: center;">
<div class="ui large breadcrumb">
<a class="section" href="{{.RepoLink}}/pulls">{{.i18n.Tr "repo.pulls"}}</a>
<div class="divider"> / </div>
<div class="action section">{{.i18n.Tr "repo.issues_detail"}}</div>
</div>
</div>
<div class="column right aligned">
{{template "repo/issue/navbar" .}}
<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName | EscapePound}}...{{.PullRequestCtx.HeadInfo | EscapePound}}">{{.i18n.Tr "repo.pulls.new"}}</a>
</div>
</div>
<div class="ui divider"></div>
{{template "repo/issue/view_title" .}}


+ 15
- 1
templates/repo/pulls/files.tmpl View File

@@ -2,11 +2,25 @@
<div class="repository view issue pull files diff">
{{template "repo/header" .}}
<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
<div class="navbar">
<!-- <div class="navbar">
{{template "repo/issue/navbar" .}}
<div class="ui right">
<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName | EscapePound}}...{{.PullRequestCtx.HeadInfo | EscapePound}}">{{.i18n.Tr "repo.pulls.new"}}</a>
</div>
</div> -->
<div class="ui two column stackable grid">
<div class="column" style="display: flex;align-items: center;">
<div class="ui large breadcrumb">
<a class="section" href="{{.RepoLink}}/pulls">{{.i18n.Tr "repo.pulls"}}</a>
<div class="divider"> / </div>
<div class="action section">{{.i18n.Tr "repo.issues_detail"}}</div>
</div>
</div>
<div class="column right aligned">
{{template "repo/issue/navbar" .}}
<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName | EscapePound}}...{{.PullRequestCtx.HeadInfo | EscapePound}}">{{.i18n.Tr "repo.pulls.new"}}</a>
</div>
</div>
<div class="ui divider"></div>
{{template "repo/issue/view_title" .}}


Loading…
Cancel
Save