8 files changed, 50 insertions, 51 deletions

diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 9c94c43e747..1d257818dcd 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal wiki-form gfm-form' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal wiki-form gfm-form prepend-top-default' } do |f|
   -if @page.errors.any?
     #error_explanation
       .alert.alert-danger
@@ -11,14 +11,7 @@
     .col-sm-10
       = f.select :format, options_for_select(ProjectWiki::MARKUPS, {selected: @page.format}), {}, class: "form-control"
 
-  .row
-    .col-sm-offset-2.col-sm-10
-      %p.cgray
-        To link to a (new) page you can just type
-        %code [Link Title](page-slug)
-        \.
-
-  .form-group.wiki-content
+  .form-group
     = f.label :content, class: 'control-label'
     .col-sm-10
       = render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do
@@ -27,6 +20,11 @@
 
       .clearfix
       .error-alert
+
+      .help-block
+        To link to a (new) page, simply type
+        %code [Link Title](page-slug)
+        \.
   .form-group
     = f.label :commit_message, class: 'control-label'
     .col-sm-10= f.text_field :message, class: 'form-control', rows: 18
diff --git a/app/views/projects/wikis/_main_links.html.haml b/app/views/projects/wikis/_main_links.html.haml
index 14f25822259..29bf5d62abe 100644
--- a/app/views/projects/wikis/_main_links.html.haml
+++ b/app/views/projects/wikis/_main_links.html.haml
@@ -1,9 +1,4 @@
 %span.pull-right
-  - if can?(current_user, :create_wiki, @project)
-    = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new btn-grouped", "data-toggle" => "modal" do
-      %i.fa.fa-plus
-      New Page
-
   - if (@page && @page.persisted?)
     = link_to namespace_project_wiki_history_path(@project.namespace, @project, @page), class: "btn btn-grouped" do
       Page History
@@ -11,5 +6,7 @@
       = link_to namespace_project_wiki_edit_path(@project.namespace, @project, @page), class: "btn btn-grouped" do
         %i.fa.fa-pencil-square-o
         Edit
-
-= render 'projects/wikis/new'
+    - if can?(current_user, :admin_wiki, @project)
+      = link_to namespace_project_wiki_path(@project.namespace, @project, @page), data: { confirm: "Are you sure you want to delete this page?"}, method: :delete, class: "btn btn-remove" do
+        = icon('trash')
+        Delete
diff --git a/app/views/projects/wikis/_nav.html.haml b/app/views/projects/wikis/_nav.html.haml
index fffb4eb31ab..e6e6ad5bc4b 100644
--- a/app/views/projects/wikis/_nav.html.haml
+++ b/app/views/projects/wikis/_nav.html.haml
@@ -1,10 +1,19 @@
-%ul.center-top-menu
-  = nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do
-    = link_to 'Home', namespace_project_wiki_path(@project.namespace, @project, :home)
+.project-issuable-filter
+  .controls
+    - if can?(current_user, :create_wiki, @project)
+      = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
+        %i.fa.fa-plus
+        New Page
 
-  = nav_link(path: 'wikis#pages') do
-    = link_to 'Pages', namespace_project_wiki_pages_path(@project.namespace, @project)
+      = render 'projects/wikis/new'
 
-  = nav_link(path: 'wikis#git_access') do
-    = link_to namespace_project_wikis_git_access_path(@project.namespace, @project) do
-      Git Access
+  %ul.center-top-menu
+    = nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do
+      = link_to 'Home', namespace_project_wiki_path(@project.namespace, @project, :home)
+
+    = nav_link(path: 'wikis#pages') do
+      = link_to 'Pages', namespace_project_wiki_pages_path(@project.namespace, @project)
+
+    = nav_link(path: 'wikis#git_access') do
+      = link_to namespace_project_wikis_git_access_path(@project.namespace, @project) do
+        Git Access
diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml
index dace172438c..f0547e9c057 100644
--- a/app/views/projects/wikis/_new.html.haml
+++ b/app/views/projects/wikis/_new.html.haml
@@ -12,5 +12,5 @@
           The page slug is invalid. Please don't use characters other then: a-z 0-9 _ - and /
         %p.hint
           Please don't use spaces.
-      .modal-footer
-        = link_to 'Build', '#', class: 'build-new-wiki btn btn-create'
+        .form-actions
+          = link_to 'Create Page', '#', class: 'build-new-wiki btn btn-create'
diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index 0b709c3695b..23f64fbbd10 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -1,16 +1,16 @@
-- page_title "Edit", @page.title, "Wiki"
+- page_title "Edit", @page.title.capitalize, "Wiki"
 = render "header_title"
 
 = render 'nav'
-.pull-right
-  = render 'main_links'
-%h3.page-title
-  Editing -
-  %span.light #{@page.title}
-%hr
-= render 'form'
+.gray-content-block
+  .pull-right
+    = render 'main_links'
+
+  %h3.page-title.oneline
+    %span.light Edit Page
+    - if @page.persisted?
+      = link_to @page.title, namespace_project_wiki_path(@project.namespace, @project, @page)
+    - else
+      = @page.title
 
-.pull-right
-  - if @page.persisted? && can?(current_user, :admin_wiki, @project)
-    = link_to namespace_project_wiki_path(@project.namespace, @project, @page), data: { confirm: "Are you sure you want to delete this page?"}, method: :delete, class: "btn btn-sm btn-remove" do
-      Delete this page
+= render 'form'
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index 6417ef4a38b..11c8c4f0eba 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -5,7 +5,7 @@
 .gray-content-block
   .row
     .col-sm-6
-      %h3.page-title
+      %h3.page-title.oneline
         Git access for
         %strong= @project_wiki.path_with_namespace
 
diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml
index d179a1abec1..aae1ad69ad9 100644
--- a/app/views/projects/wikis/pages.html.haml
+++ b/app/views/projects/wikis/pages.html.haml
@@ -1,11 +1,10 @@
-- page_title "All Pages", "Wiki"
+- page_title "Pages", "Wiki"
 = render "header_title"
 
 = render 'nav'
 .gray-content-block
-  = render 'main_links'
-  %h3.page-title
-    All Pages
+  All pages in this wiki are listed below.
+  
 %ul.content-list
   - @wiki_pages.each do |wiki_page|
     %li
diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml
index 55fbf5a8b6e..309d40f52bc 100644
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
@@ -5,11 +5,12 @@
 
 .gray-content-block
   = render 'main_links'
-  %h3.page-title
+  %h3.page-title.oneline
     = @page.title.capitalize
 
-  .wiki-last-edit-by
-    Last edited by #{@page.commit.author.name} #{time_ago_with_tooltip(@page.commit.authored_date)}
+    %span.wiki-last-edit-by
+      ·
+      last edited by #{@page.commit.author.name} #{time_ago_with_tooltip(@page.commit.authored_date)}
 
 - if @page.historical?
   .warning_message
@@ -21,8 +22,3 @@
   .wiki
     = preserve do
       = render_wiki_content(@page)
-
-.gray-content-block.footer-block
-  .wiki-last-edit-by
-    Last edited by #{@page.commit.author.name} #{time_ago_with_tooltip(@page.commit.authored_date)}
-