Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add hints for special Wiki pages #17283

Merged
merged 8 commits into from
Dec 3, 2021
Merged

Add hints for special Wiki pages #17283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6dc13a3
Add UI hints to create a Wiki sidebar and footer
n194 Oct 10, 2021
92ac8d2
Undo Sidebar and Footer hints in Wiki
n194 Oct 11, 2021
0cebd65
Add description to Wiki new page creation
n194 Oct 11, 2021
17d79f5
Re-add newline on wiki/view.tmpl and fix lint
n194 Oct 11, 2021
122e107
Remove now unnecessary CSS change
n194 Oct 11, 2021
3a3bbc8
Shorten wiki page name description
n194 Nov 26, 2021
968caa0
Merge branch 'main' into wiki-footer-sidebar-hints
6543 Dec 2, 2021
c0417a6
Merge branch 'main' into wiki-footer-sidebar-hints
wxiaoguang Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1585,6 +1585,7 @@ wiki.page_already_exists = A wiki page with the same name already exists.
wiki.reserved_page = The wiki page name '%s' is reserved.
wiki.pages = Pages
wiki.last_updated = Last updated %s
wiki.page_name_desc = Enter a name for this Wiki page. Some special names are: 'Home', '_Sidebar' and '_Footer'.

activity = Activity
activity.period.filter_label = Period:
Expand Down
3 changes: 3 additions & 0 deletions routers/web/repo/wiki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,9 @@ func NewWiki(ctx *context.Context) {
if !ctx.Repo.Repository.HasWiki() {
ctx.Data["title"] = "Home"
}
if ctx.FormString("title") != "" {
ctx.Data["title"] = ctx.FormString("title")
}

ctx.HTML(http.StatusOK, tplWikiNew)
}
Expand Down
3 changes: 3 additions & 0 deletions templates/repo/wiki/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
<div class="field {{if .Err_Title}}error{{end}}">
<input name="title" value="{{.title}}" autofocus required>
</div>
<div class="help">
{{.i18n.Tr "repo.wiki.page_name_desc"}}
</div>
n194 marked this conversation as resolved.
Show resolved Hide resolved
<div class="ui top attached tabular menu previewtabs" data-write="write" data-preview="preview">
<a class="active item" data-tab="write">{{.i18n.Tr "write"}}</a>
<a class="item" data-tab="preview" data-url="{{$.Repository.APIURL}}/markdown" data-context="{{$.RepoLink}}">{{$.i18n.Tr "preview"}}</a>
Expand Down