diff options
| author | Jacques Erasmus <jerasmus@gitlab.com> | 2018-10-18 12:24:09 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-10-18 12:24:09 +0000 |
| commit | 802e6f03c992001e77d26aab641607b9ad0b4f92 (patch) | |
| tree | 1d642681383d9b33233a0efc241eebb702f1f42d | |
| parent | 0a1734065e9f47ba3d13daf9317d4e27e834becd (diff) | |
| download | gitlab-ce-802e6f03c992001e77d26aab641607b9ad0b4f92.tar.gz | |
Show wiki empty state layout on wiki-only project overview page
| -rw-r--r-- | app/views/projects/_wiki.html.haml | 16 | ||||
| -rw-r--r-- | changelogs/unreleased/48731-show-empty-state-on-wiki-only-projects.yml | 6 | ||||
| -rw-r--r-- | locale/gitlab.pot | 9 |
3 files changed, 23 insertions, 8 deletions
diff --git a/app/views/projects/_wiki.html.haml b/app/views/projects/_wiki.html.haml index 5adca007f7e..45e1d32980c 100644 --- a/app/views/projects/_wiki.html.haml +++ b/app/views/projects/_wiki.html.haml @@ -5,14 +5,14 @@ = render_wiki_content(@wiki_home, legacy_render_context(params)) - else - 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)] } - .text-center{ class: container_class } + .landing{ class: [('row-content-block row p-0 align-items-center' if can_create_wiki), ('content-block' unless can_create_wiki)] } + .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 - This project does not have a wiki homepage yet + = _("This project does not have a wiki homepage yet") - if can_create_wiki %p - Add a homepage to your wiki that contains information about your project - %p - 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. + = _("Add a homepage to your wiki that contains information about your project and GitLab will display it here instead of this message.") + = link_to _("Create your first page"), project_wiki_path(@project, :home) + '?view=create', class: "btn btn-primary" diff --git a/changelogs/unreleased/48731-show-empty-state-on-wiki-only-projects.yml b/changelogs/unreleased/48731-show-empty-state-on-wiki-only-projects.yml new file mode 100644 index 00000000000..8fd1b48b00e --- /dev/null +++ b/changelogs/unreleased/48731-show-empty-state-on-wiki-only-projects.yml @@ -0,0 +1,6 @@ +--- +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 diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 363654b2ac0..36f6dd5ef24 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -330,6 +330,9 @@ msgstr "" msgid "Add Readme" 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" msgstr "" @@ -2049,6 +2052,9 @@ msgstr "" msgid "Create project label" msgstr "" +msgid "Create your first page" +msgstr "" + msgid "CreateTag|Tag" msgstr "" @@ -6197,6 +6203,9 @@ msgstr "" msgid "This project does not belong to a group and can therefore not make use of group Runners." 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." msgstr "" |