realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

Fixed wrong AppSubUrl in multiple templates (#10447)

Browse source 
* Fixed wrong AppSubUrl in OAuth2 app edit page

* Replaced all other occurrences of $.AppSubURL for support of sub-paths
This commit is contained in:
Philipp A. Beckmann 2020-02-25 16:58:37 +01:00 committed by GitHub
parent 85e6a1267c
commit bab6e1ed87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/explore/code.tmpl
View file

@ -18,7 +18,7 @@
</h3> </h3>
<div> <div>
{{range $term := .SearchResultLanguages}} {{range $term := .SearchResultLanguages}}
<a class="ui {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{$.AppSubURL}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}"> <a class="ui {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
<i class="color-icon" style="background-color: {{$term.Color}}"></i> <i class="color-icon" style="background-color: {{$term.Color}}"></i>
{{$term.Language}} {{$term.Language}}
<div class="detail">{{$term.Count}}</div> <div class="detail">{{$term.Count}}</div>

2
templates/repo/settings/lfs_locks.tmpl
View file

@ -34,7 +34,7 @@
{{end}} {{end}}
</td> </td>
<td> <td>
<a href="{{$.AppSubUrl}}/{{$lock.Owner.Name}}"> <a href="{{AppSubUrl}}/{{$lock.Owner.Name}}">
<img class="ui avatar image" src="{{$lock.Owner.RelAvatarLink}}"> <img class="ui avatar image" src="{{$lock.Owner.RelAvatarLink}}">
{{$lock.Owner.DisplayName}} {{$lock.Owner.DisplayName}}
</a> </a>

4
templates/user/settings/applications_oauth2_edit.tmpl
View file

@ -30,14 +30,14 @@
<div class="item"> <div class="item">
<!-- TODO add regenerate secret functionality */ --> <!-- TODO add regenerate secret functionality */ -->
{{.i18n.Tr "settings.oauth2_regenerate_secret_hint"}} {{.i18n.Tr "settings.oauth2_regenerate_secret_hint"}}
<form class="ui form ignore-dirty" action="{{$.AppSubURL}}/user/settings/applications/oauth2/{{.App.ID}}/regenerate_secret" method="post"> <form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/settings/applications/oauth2/{{.App.ID}}/regenerate_secret" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<a href="#" onclick="event.target.parentNode.submit()">{{.i18n.Tr "settings.oauth2_regenerate_secret"}}</a> <a href="#" onclick="event.target.parentNode.submit()">{{.i18n.Tr "settings.oauth2_regenerate_secret"}}</a>
</form> </form>
</div> </div>
</div> </div>
<div class="ui attached bottom segment"> <div class="ui attached bottom segment">
<form class="ui form ignore-dirty" action="{{$.AppSubURL}}/user/settings/applications/oauth2/{{.App.ID}}" method="post"> <form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/settings/applications/oauth2/{{.App.ID}}" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="field {{if .Err_AppName}}error{{end}}"> <div class="field {{if .Err_AppName}}error{{end}}">
<label for="application-name">{{.i18n.Tr "settings.oauth2_application_name"}}</label> <label for="application-name">{{.i18n.Tr "settings.oauth2_application_name"}}</label>