Commit 054d900e authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '48731-show-empty-state-on-wiki-only-projects' into 'master'

Show wiki empty state layout on wiki-only project overview page

Closes #48731

See merge request gitlab-org/gitlab-ce!22262
parents 0a173406 802e6f03
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
= render_wiki_content(@wiki_home, legacy_render_context(params)) = render_wiki_content(@wiki_home, legacy_render_context(params))
- else - else
- can_create_wiki = can?(current_user, :create_wiki, @project) - can_create_wiki = can?(current_user, :create_wiki, @project)
.project-home-empty{ class: [('row-content-block' if can_create_wiki), ('content-block' unless can_create_wiki)] } .landing{ class: [('row-content-block row p-0 align-items-center' if can_create_wiki), ('content-block' unless can_create_wiki)] }
.text-center{ class: container_class } .col-12.col-md-3.p-0
.svg-content
= image_tag 'illustrations/wiki_login_empty.svg'
.col-12.col-md-9.text-center.text-md-left.pl-md-0.pl-sm-3.mb-4
%h4 %h4
This project does not have a wiki homepage yet = _("This project does not have a wiki homepage yet")
- if can_create_wiki - if can_create_wiki
%p %p
Add a homepage to your wiki that contains information about your project = _("Add a homepage to your wiki that contains information about your project and GitLab will display it here instead of this message.")
%p = link_to _("Create your first page"), project_wiki_path(@project, :home) + '?view=create', class: "btn btn-primary"
We recommend you
= link_to "add a homepage", project_wiki_path(@project, :home)
to your project's wiki and GitLab will show it here instead of this message.
---
title: Update the empty state on wiki-only projects to display an empty state that
is more consistent with the rest of the system.
merge_request: 22262
author:
type: changed
...@@ -330,6 +330,9 @@ msgstr "" ...@@ -330,6 +330,9 @@ msgstr ""
msgid "Add Readme" msgid "Add Readme"
msgstr "" msgstr ""
msgid "Add a homepage to your wiki that contains information about your project and GitLab will display it here instead of this message."
msgstr ""
msgid "Add a table" msgid "Add a table"
msgstr "" msgstr ""
...@@ -2049,6 +2052,9 @@ msgstr "" ...@@ -2049,6 +2052,9 @@ msgstr ""
msgid "Create project label" msgid "Create project label"
msgstr "" msgstr ""
msgid "Create your first page"
msgstr ""
msgid "CreateTag|Tag" msgid "CreateTag|Tag"
msgstr "" msgstr ""
...@@ -6197,6 +6203,9 @@ msgstr "" ...@@ -6197,6 +6203,9 @@ msgstr ""
msgid "This project does not belong to a group and can therefore not make use of group Runners." msgid "This project does not belong to a group and can therefore not make use of group Runners."
msgstr "" msgstr ""
msgid "This project does not have a wiki homepage yet"
msgstr ""
msgid "This project does not have billing enabled. To create a cluster, <a href=%{linkToBilling} target=\"_blank\" rel=\"noopener noreferrer\">enable billing <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a> and try again." msgid "This project does not have billing enabled. To create a cluster, <a href=%{linkToBilling} target=\"_blank\" rel=\"noopener noreferrer\">enable billing <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a> and try again."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment