summaryrefslogtreecommitdiffstats
path: root/templates/repo
diff options
context:
space:
mode:
Diffstat (limited to 'templates/repo')
-rw-r--r--templates/repo/wiki/pages.tmpl2
-rw-r--r--templates/repo/wiki/view.tmpl25
2 files changed, 24 insertions, 3 deletions
diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl
index 1cfbddce5a..123e65bc23 100644
--- a/templates/repo/wiki/pages.tmpl
+++ b/templates/repo/wiki/pages.tmpl
@@ -4,9 +4,11 @@
<div class="ui container">
<div class="ui header">
{{.i18n.Tr "repo.wiki.pages"}}
+ {{if and .IsRepositoryWriter (not .IsRepositoryMirror)}}
<div class="ui right">
<a class="ui green small button" href="{{.RepoLink}}/wiki/_new">{{.i18n.Tr "repo.wiki.new_page_button"}}</a>
</div>
+ {{end}}
</div>
<table class="ui table">
<tbody>
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index b8b0d2702a..9a1a984b63 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -50,7 +50,7 @@
</div>
</div>
</div>
- <div class="ui dividing header">
+ <div class="ui header">
{{.title}}
{{if and .IsRepositoryWriter (not .Repository.IsMirror)}}
<div class="ui right">
@@ -64,9 +64,28 @@
{{.i18n.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}}
</div>
</div>
- <div class="ui segment markdown">
- {{.content | Str2html}}
+ {{if .FormatWarning}}
+ <div class="ui negative message">
+ <p>{{.FormatWarning}}</p>
+ </div>
+ {{end}}
+ <div class="ui {{if .sidebarPresent}}grid equal width{{end}}" style="margin-top: 1rem;">
+ <div class="ui {{if .sidebarPresent}}eleven wide column{{end}} segment markdown">
+ {{.content | Str2html}}
+ </div>
+ {{if .sidebarPresent}}
+ <div class="column" style="padding-top: 0;">
+ <div class="ui segment">
+ {{.sidebarContent | Str2html}}
+ </div>
+ </div>
+ {{end}}
+ </div>
+ {{if .footerPresent}}
+ <div class="ui grey segment">
+ {{.footerContent | Str2html}}
</div>
+ {{end}}
</div>
</div>