Merge branch 'V20211018' of git.openi.org.cn:OpenI/aiforge into judge_job_del

templates/repo/issue/view.tmpl

@@ -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}}

templates/repo/pulls/commits.tmpl

@@ -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" .}}

templates/repo/pulls/files.tmpl

@@ -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" .}}