diff options
| author | Ethan Koenig <ethantkoenig@gmail.com> | 2017-11-28 01:43:51 -0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-11-28 17:43:51 +0800 |
| commit | b7ebaf6d2078cbf4de00d0782be8bc1b1de644bb (patch) | |
| tree | 5ad8ef6f9738883e89559112e965b9a0bf303476 /templates/repo/wiki | |
| parent | 6a58e3f9fcb8b9f30345e2f8a5812bda72c6baf5 (diff) | |
| download | gitea-b7ebaf6d2078cbf4de00d0782be8bc1b1de644bb.tar.gz gitea-b7ebaf6d2078cbf4de00d0782be8bc1b1de644bb.zip | |
Various wiki bug fixes (#2996)
* Update macaron
* Various wiki bug fixes
Diffstat (limited to 'templates/repo/wiki')
| -rw-r--r-- | templates/repo/wiki/pages.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/wiki/view.tmpl | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index 123e65bc23..8437e9b6b3 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -16,7 +16,7 @@ <tr> <td> <i class="octicon octicon-file-text"></i> - <a href="{{$.RepoLink}}/wiki/{{.URL}}">{{.Name}}</a> + <a href="{{$.RepoLink}}/wiki/{{.SubURL}}">{{.Name}}</a> </td> {{$timeSince := TimeSince .Updated $.Lang}} <td class="text right grey">{{$.i18n.Tr "repo.wiki.last_updated" $timeSince | Safe}}</td> diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 79f17f5de9..aa58ab36eb 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -21,7 +21,7 @@ </div> <div class="scrolling menu"> {{range .Pages}} - <div class="item {{if eq $.Title .Name}}selected{{end}}" data-url="{{$.RepoLink}}/wiki/{{.URL}}">{{.Name}}</div> + <div class="item {{if eq $.Title .Name}}selected{{end}}" data-url="{{$.RepoLink}}/wiki/{{.SubURL}}">{{.Name}}</div> {{end}} </div> </div> @@ -57,9 +57,9 @@ {{$title}} {{if and .IsRepositoryWriter (not .Repository.IsMirror)}} <div class="ui right"> - <a class="ui small button" href="{{.RepoLink}}/wiki/{{EscapePound .PageURL}}/_edit">{{.i18n.Tr "repo.wiki.edit_page_button"}}</a> + <a class="ui small button" href="{{.RepoLink}}/wiki/{{.PageURL}}/_edit">{{.i18n.Tr "repo.wiki.edit_page_button"}}</a> <a class="ui green small button" href="{{.RepoLink}}/wiki/_new">{{.i18n.Tr "repo.wiki.new_page_button"}}</a> - <a class="ui red small button delete-button" href="" data-url="{{.RepoLink}}/wiki/{{EscapePound .PageURL}}/delete" data-id="{{EscapePound .PageURL}}">{{.i18n.Tr "repo.wiki.delete_page_button"}}</a> + <a class="ui red small button delete-button" href="" data-url="{{.RepoLink}}/wiki/{{.PageURL}}/delete" data-id="{{.PageURL}}">{{.i18n.Tr "repo.wiki.delete_page_button"}}</a> </div> {{end}} <div class="ui sub header"> @@ -85,7 +85,7 @@ {{end}} </div> {{if .footerPresent}} - <div class="ui grey segment"> + <div class="ui segment"> {{.footerContent | Str2html}} </div> {{end}} |