3 files changed, 75 insertions, 0 deletions
diff --git a/app/views/shared/wiki/_main_links.html.haml b/app/views/shared/wiki/_main_links.html.haml
new file mode 100644
index 00000000000..5e41bb6a9cd
--- /dev/null
+++ b/app/views/shared/wiki/_main_links.html.haml
@@ -0,0 +1,9 @@
+- if (@page && @page.persisted?)
+  - if can?(current_user, :create_wiki, @project)
+    = link_to project_wiki_pages_new_path(@project), class: "add-new-wiki btn btn-success", role: "button" do
+      = s_("Wiki|New page")
+  = link_to project_wiki_history_path(@project, @page), class: "btn", role: "button" do
+    = s_("Wiki|Page history")
+  - if can?(current_user, :create_wiki, @project) && @page.latest? && @valid_encoding
+    = link_to project_wiki_edit_path(@project, @page), class: "btn js-wiki-edit", role: "button" do
+      = _("Edit")
diff --git a/app/views/shared/wiki/_page_listing.html.haml b/app/views/shared/wiki/_page_listing.html.haml
new file mode 100644
index 00000000000..80f3071a8b2
--- /dev/null
+++ b/app/views/shared/wiki/_page_listing.html.haml
@@ -0,0 +1,45 @@
+- @no_container = true
+- current_sorting = params.permit(:sort, :direction)
+- sort_title = wiki_sort_title(params[:sort])
+
+%div{ class: container_class }
+  .wiki-page-header.top-area.flex-column.flex-lg-row
+
+    .nav-text.flex-fill
+      %h2.wiki-page-title
+        = wiki_page_title
+
+    .nav-controls.pb-md-3.pb-lg-0
+      - if can?(current_user, :create_wiki, @project)
+        = link_to project_wiki_pages_new_path(@project), class: "add-new-wiki btn btn-success" do
+          = s_("Wiki|New page")
+
+      = link_to project_wikis_git_access_path(@project), class: 'btn qa-clone-repository-link' do
+        = sprite_icon('download', size: 16)
+        = _("Clone repository")
+
+      - if @nesting.present? && allow_change_nesting
+        .dropdown.inline.wiki-nesting-dropdown
+          .btn-group{ role: 'group' }
+            %button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn btn-default' }
+              = wiki_show_children_icon(@nesting)
+              = sprite_icon('chevron-down', size: 16)
+            %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
+              - ProjectWiki::NESTINGS.each do |choice|
+                %li= link_to wiki_show_children_icon(choice), page_path.call(current_sorting.merge(show_children: choice)), class: @nesting == choice ? 'is-active' : ''
+
+      .dropdown.inline.wiki-sort-dropdown
+        .btn-group{ role: 'group' }
+          %button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn btn-default' }
+            = sort_title
+            = sprite_icon('chevron-down', size: 16)
+          %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
+            %li
+              = sortable_item(s_("Wiki|Title"), page_path.call(sort: ProjectWiki::TITLE_ORDER), sort_title)
+              = sortable_item(s_("Wiki|Created date"), page_path.call(sort: ProjectWiki::CREATED_AT_ORDER), sort_title)
+          = wiki_sort_controls(current_sorting.merge(show_children: @nesting), &page_path)
+
+  %ul.wiki-pages-list.content-list
+    = render @wiki_entries, context: 'pages'
+
+  = paginate @wiki_pages, theme: 'gitlab'
diff --git a/app/views/shared/wiki/_sidebar.html.haml b/app/views/shared/wiki/_sidebar.html.haml
new file mode 100644
index 00000000000..83d145444d8
--- /dev/null
+++ b/app/views/shared/wiki/_sidebar.html.haml
@@ -0,0 +1,21 @@
+%aside.right-sidebar.right-sidebar-expanded.wiki-sidebar.js-wiki-sidebar.js-right-sidebar{ data: { "offset-top" => "50", "spy" => "affix" } }
+  .sidebar-container
+    .block.wiki-sidebar-header.append-bottom-default.w-100
+      %a.gutter-toggle.float-right.d-block.d-sm-block.d-md-none.js-sidebar-wiki-toggle{ href: "#" }
+        = icon('angle-double-right')
+
+      - git_access_url = project_wikis_git_access_path(@project)
+      = link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '' do
+        = icon('cloud-download', class: 'append-right-5')
+        %span= _("Clone repository")
+
+    .blocks-container
+      .block.block-first.w-100
+        - if @sidebar_page
+          = render_wiki_content(@sidebar_page)
+        - else
+          %ul.wiki-pages
+            = render @sidebar_wiki_entries, context: 'sidebar'
+      .block.w-100
+        = link_to project_wikis_pages_path(@project), class: 'btn btn-block' do
+          = s_("Wiki|More Pages")