Browse Source

Incorporate some changes from upstream (up to e64aa18)

master
Gerben 1 year ago
parent
commit
88805f1eec
6 changed files with 14 additions and 12 deletions
  1. +3
    -1
      templates/base/footer.tmpl
  2. +3
    -1
      templates/base/head.tmpl
  3. +2
    -4
      templates/repo/branch/list.tmpl
  4. +3
    -3
      templates/repo/header.tmpl
  5. +2
    -2
      templates/repo/view_list.tmpl
  6. +1
    -1
      templates/user/profile.tmpl

+ 3
- 1
templates/base/footer.tmpl View File

@@ -39,6 +39,9 @@
{{if .RequireDropzone}}
<script src="{{AppSubUrl}}/vendor/plugins/dropzone/dropzone.js"></script>
{{end}}
{{if .RequireU2F}}
<script src="{{AppSubUrl}}/vendor/plugins/u2f/index.js"></script>
{{end}}
{{if .RequireTribute}}
<script src="{{AppSubUrl}}/vendor/plugins/tribute/tribute.min.js"></script>

@@ -107,4 +110,3 @@
{{template "custom/footer" .}}
</body>
</html>


+ 3
- 1
templates/base/head.tmpl View File

@@ -121,6 +121,9 @@
{{end}}
<meta property="og:site_name" content="{{AppName}}" />
{{end}}
{{if ne DefaultTheme "gitea"}}
<link rel="stylesheet" href="{{AppSubUrl}}/css/theme-{{DefaultTheme}}.css">
{{end}}
{{template "custom/header" .}}
</head>
<body>
@@ -135,4 +138,3 @@
</body>
</html>
*/}}


+ 2
- 4
templates/repo/branch/list.tmpl View File

@@ -69,12 +69,10 @@
<div class="ui small basic delete modal">
<div class="ui icon header">
<i class="trash icon"></i>
{{.i18n.Tr "repo.branch.delete_html"| Safe}} <span class="branch-name"></span>
{{.i18n.Tr "repo.branch.delete_html"}} <span class="branch-name"></span>
</div>
<div class="content">
<p>{{.i18n.Tr "repo.branch.delete_desc" | Safe}}</p>
{{.i18n.Tr "repo.branch.delete_notices_1" | Safe}}<br>
{{.i18n.Tr "repo.branch.delete_notices_html" | Safe}} <span class="branch-name"></span><br>
<p>{{.i18n.Tr "repo.branch.delete_desc" | Str2html}}</p>
</div>
{{template "base/delete_modal_actions" .}}
</div>


+ 3
- 3
templates/repo/header.tmpl View File

@@ -4,7 +4,7 @@
<div class="ui stackable grid header-grid">
<i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i>
<div class="ui huge breadcrumb">
{{if .IsMirror}}<div class="fork-flag">{{$.i18n.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener" href="{{$.Mirror.Address}}">{{$.Mirror.Address}}</a></div>{{end}}
{{if .IsMirror}}<div class="fork-flag">{{$.i18n.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener noreferrer" href="{{$.Mirror.Address}}">{{$.Mirror.Address}}</a></div>{{end}}
{{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.Link}}">{{SubStr .BaseRepo.RelLink 1 -1}}</a></div>{{end}}
<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
<div class="divider"> / </div>
@@ -23,13 +23,13 @@
<div class="ui tabs container">
<div class="ui tabular stackable menu navbar">
{{if .Repository.UnitEnabled $.UnitTypeCode}}
<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}">
<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL}}{{end}}">
<i class="octicon octicon-code"></i> {{.i18n.Tr "repo.code"}}
</a>
{{end}}

{{if .Repository.UnitEnabled $.UnitTypeIssues}}
<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues">
<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues" rel="noopener noreferrer">
<i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} <span class="ui small label">{{.Repository.NumOpenIssues}}</span>
</a>
{{end}}


+ 2
- 2
templates/repo/view_list.tmpl View File

@@ -63,7 +63,7 @@
{{end}}
</a>
{{else}}
<span class="octicon octicon-file-text"></span>
<span class="octicon octicon-{{EntryIcon $entry}}"></span>
<a href="{{EscapePound $.TreeLink}}/{{EscapePound $entry.Name}}">{{$entry.Name}}</a>
{{end}}
</td>
@@ -75,4 +75,4 @@
</table>
{{if .ReadmeExist}}
{{template "repo/view_file" .}}
{{end}}
{{end}}

+ 1
- 1
templates/user/profile.tmpl View File

@@ -17,7 +17,7 @@
{{template "user/dashboard/feeds" .}}
</div>
{{else}}
{{template "explore/search" .}}
{{template "explore/repo_search" .}}
{{template "explore/repo_list" .}}
{{template "base/paginate" .}}
{{end}}


Loading…
Cancel
Save