improve

Author: yp05327

modules/context/context_response.go

@@ -137,7 +137,11 @@ func (ctx *Context) notFoundInternal(logMsg string, logErr error) {
 
 	ctx.Data["IsRepo"] = ctx.Repo.Repository != nil
 	ctx.Data["Title"] = "Page Not Found"
-	ctx.Data["IsTreeNotFound"] = git.IsErrNotExist(logErr)
+
+	if git.IsErrNotExist(logErr) {
+		ctx.Data["NotFoundPrompt"] = ctx.Locale.Tr("repo.tree_not_found", ctx.Repo.BranchName, ctx.Repo.Repository.Name, ctx.Repo.TreePath)
+		ctx.Data["NotFoundGoBackURL"] = ctx.Repo.RepoLink + "/src/branch/" + url.PathEscape(ctx.Repo.BranchName)
+	}
 	ctx.HTML(http.StatusNotFound, base.TplName("status/404"))
 }
 

options/locale/locale_en-US.ini

@@ -112,6 +112,7 @@ step2 = Step 2:
 
 error = Error
 error404 = The page you are trying to reach either <strong>does not exist</strong> or <strong>you are not authorized</strong> to view it.
+back = Back
 
 never = Never
 unknown = Unknown
@@ -1007,8 +1008,7 @@ delete_preexisting_success = Deleted unadopted files in %s
 blame_prior = View blame prior to this change
 author_search_tooltip = Shows a maximum of 30 users
 
-tree_not_found = The <span class="ui label">%s</span> branch of %s does not contain the path %s
-return_to_repository = Return to the repository
+tree_not_found = The %s branch of %s does not contain the path %s
 
 transfer.accept = Accept Transfer
 transfer.accept_desc =  Transfer to "%s"

templates/status/404.tmpl

@@ -3,15 +3,13 @@
 	{{if .IsRepo}}{{template "repo/header" .}}{{end}}
 	<div class="ui container center">
 		<p style="margin-top: 100px"><img src="{{AssetUrlPrefix}}/img/404.png" alt="404"></p>
+		<p>{{if .NotFoundPrompt}}{{.NotFoundPrompt}}{{else}}{{.locale.Tr "error404" | Safe}}{{end}}</p>
+		{{if .NotFoundGoBackURL}}<a class="ui button green" href="{{.NotFoundGoBackURL}}">{{.locale.Tr "back"}}</a>{{end}}
+
 		<div class="divider"></div>
 		<br>
-		{{if and .IsRepo .IsTreeNotFound}}
-		<p>{{.locale.Tr "repo.tree_not_found" .BranchName .RepoName .TreePath | Safe}}</p>
-		<a class="ui button green" href="{{.Repository.Link}}/src/branch/{{.BranchName | PathEscape}}">{{.locale.Tr "repo.return_to_repository"}}</a>
-		{{else}}
-		<p>{{.locale.Tr "error404" | Safe}}</p>
+
 		{{if .ShowFooterVersion}}<p>{{.locale.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}}
-		{{end}}
 	</div>
 </div>
 {{template "base/footer" .}}