Skip to content

Commit 309307a

Browse files
committed
fix
1 parent c3ecaed commit 309307a

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

modules/web/middleware/data.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ func GetContextData(c context.Context) reqctx.ContextData {
2222

2323
func CommonTemplateContextData() reqctx.ContextData {
2424
return reqctx.ContextData{
25+
"PageTitleCommon": setting.AppName,
26+
2527
"IsLandingPageOrganizations": setting.LandingPageURL == setting.LandingPageOrganizations,
2628

2729
"ShowRegistrationButton": setting.Service.ShowRegistrationButton,

services/context/repo.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ func RepoAssignment(ctx *Context) {
537537
}
538538

539539
ctx.Data["Title"] = repo.Owner.Name + "/" + repo.Name
540+
ctx.Data["PageTitleCommon"] = repo.Name + " - " + setting.AppName
540541
ctx.Data["Repository"] = repo
541542
ctx.Data["Owner"] = ctx.Repo.Repository.Owner
542543
ctx.Data["CanWriteCode"] = ctx.Repo.CanWrite(unit_model.TypeCode)

templates/base/head.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="{{ctx.Locale.Lang}}" data-theme="{{UserThemeName .SignedUser}}">
33
<head>
44
<meta name="viewport" content="width=device-width, initial-scale=1">
5-
<title>{{if .Title}}{{.Title}} - {{end}}{{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}}</title>
5+
<title>{{if .Title}}{{.Title}} - {{end}}{{.PageTitleCommon}}</title>
66
{{if .ManifestData}}<link rel="manifest" href="data:{{.ManifestData}}">{{end}}
77
<meta name="author" content="{{if .Repository}}{{.Owner.Name}}{{else}}{{MetaAuthor}}{{end}}">
88
<meta name="description" content="{{if .Repository}}{{.Repository.Name}}{{if .Repository.Description}} - {{.Repository.Description}}{{end}}{{else}}{{MetaDescription}}{{end}}">

templates/repo/view_content.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{$isTreePathRoot := not .TreeNames}}
22

3-
<div class="repo-view-content-data tw-hidden" data-document-title="{{ctx.RootData.Title}}"></div>
3+
<div class="repo-view-content-data tw-hidden" data-document-title="{{ctx.RootData.Title}}" data-document-title-common="{{ctx.RootData.PageTitleCommon}}"></div>
44
{{template "repo/sub_menu" .}}
55
<div class="repo-button-row">
66
<div class="repo-button-row-left">

web_src/js/components/ViewFileTreeStore.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ export function createViewFileTreeStore(props: {repoLink: string, treePath: stri
3030
const response = await GET(u.href);
3131
const elViewContent = document.querySelector('.repo-view-content');
3232
elViewContent.innerHTML = await response.text();
33-
document.title = elViewContent.querySelector('.repo-view-content-data').getAttribute('data-document-title');
33+
const t1 = elViewContent.querySelector('.repo-view-content-data').getAttribute('data-document-title');
34+
const t2 = elViewContent.querySelector('.repo-view-content-data').getAttribute('data-document-title-common');
35+
document.title = `${t1} - ${t2}`; // follow the format in head.tmpl: <head><title>...</title></head>
3436
},
3537

3638
async navigateTreeView(treePath: string) {

0 commit comments

Comments
 (0)