Set of small improvements to wiki frontend

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/assets/javascripts/wikis.js.coffee

@@ -2,7 +2,7 @@
 
 class @Wikis
   constructor: ->
-    $('.build-new-wiki').bind 'click', (e) =>
+    $('.new-wiki-page').on 'submit', (e) =>
       $('[data-error~=slug]').addClass('hidden')
       field = $('#new_wiki_path')
       slug = @slugify(field.val())
@@ -10,6 +10,7 @@ class @Wikis
       if (slug.length > 0)
         path = field.attr('data-wikis-path')
         location.href = path + '/' + slug
+        e.preventDefault()
 
   dasherize: (value) ->
     value.replace(/[_\s]+/g, '-')

app/assets/stylesheets/framework/nav.scss

@@ -77,12 +77,21 @@
     margin-bottom: 0px;
 
     > .dropdown {
-      margin-right: 10px;
+      margin-right: $gl-padding-top;
       display: inline-block;
     }
 
     > .btn {
+      margin-right: $gl-padding-top;
       display: inline-block;
+
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+
+    > .btn-grouped {
+      float: none;
     }
 
     > form {
@@ -94,7 +103,7 @@
       display: inline-block;
       position: relative;
       top: 1px;
-      margin-right: 10px;
+      margin-right: $gl-padding-top;
 
       /* Medium devices (desktops, 992px and up) */
       @media (min-width: $screen-md-min) { width: 200px; }

app/assets/stylesheets/pages/wiki.scss

@@ -4,8 +4,3 @@
   margin-right: auto;
   padding-right: 7px;
 }
-
-.wiki-last-edit-by {
-  font-size: 80%;
-  font-weight: normal;
-}

app/views/projects/wikis/_main_links.html.haml

-%span.pull-right
-  - if (@page && @page.persisted?)
-    = link_to namespace_project_wiki_history_path(@project.namespace, @project, @page), class: "btn btn-grouped" do
-      Page History
-    - if can?(current_user, :create_wiki, @project)
-      = link_to namespace_project_wiki_edit_path(@project.namespace, @project, @page), class: "btn btn-grouped" do
-        %i.fa.fa-pencil-square-o
-        Edit
-    - 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
+- if (@page && @page.persisted?)
+  = link_to namespace_project_wiki_history_path(@project.namespace, @project, @page), class: "btn btn-grouped" do
+    Page History
+  - if can?(current_user, :create_wiki, @project)
+    = link_to namespace_project_wiki_edit_path(@project.namespace, @project, @page), class: "btn btn-grouped" do
+      %i.fa.fa-pencil-square-o
+      Edit
+  - 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

app/views/projects/wikis/_nav.html.haml

@@ -16,4 +16,4 @@
         = icon('plus')
         New Page
 
-      = render 'projects/wikis/new'
+= render 'projects/wikis/new'

app/views/projects/wikis/_new.html.haml

@@ -5,9 +5,10 @@
         %a.close{href: "#", "data-dismiss" => "modal"} ×
         %h3.page-title New Wiki Page
       .modal-body
-        .form-group
-          = label_tag :new_wiki_path do
-            %span Page slug
-          = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'form-control', required: true, :'data-wikis-path' => namespace_project_wikis_path(@project.namespace, @project)
-        .form-actions
-          = link_to 'Create Page', '#', class: 'build-new-wiki btn btn-create'
+        %form.new-wiki-page
+          .form-group
+            = label_tag :new_wiki_path do
+              %span Page slug
+            = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'form-control', required: true, :'data-wikis-path' => namespace_project_wikis_path(@project.namespace, @project), autofocus: true
+          .form-actions
+            = button_tag 'Create Page', class: 'build-new-wiki btn btn-create'

app/views/projects/wikis/edit.html.haml

 - page_title "Edit", @page.title.capitalize, "Wiki"
 = render "header_title"
-
 = render 'nav'
-.gray-content-block
-  .pull-right
+
+.top-area
+  .nav-text
+    %strong
+      - if @page.persisted?
+        = link_to @page.title.capitalize, namespace_project_wiki_path(@project.namespace, @project, @page)
+      - else
+        = @page.title.capitalize
+    %span.light
+      ·
+      Edit
+
+  .nav-controls
     = 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
 
 = render 'form'

app/views/projects/wikis/history.html.haml

 - page_title "History", @page.title.capitalize, "Wiki"
 = render "header_title"
-
 = render 'nav'
-.gray-content-block
-  %h3.page-title
-    %span.light History for
-    = link_to @page.title, namespace_project_wiki_path(@project.namespace, @project, @page)
+
+.top-area
+  .nav-text
+    %strong
+      = link_to @page.title.capitalize, namespace_project_wiki_path(@project.namespace, @project, @page)
+    %span.light
+      ·
+      History
 
 .table-holder
   %table.table

app/views/projects/wikis/pages.html.haml

@@ -2,15 +2,12 @@
 = render "header_title"
 
 = render 'nav'
-.gray-content-block
-  All pages in this wiki are listed below.
-  
+
 %ul.content-list
   - @wiki_pages.each do |wiki_page|
     %li
-      %h4
-        = link_to wiki_page.title, namespace_project_wiki_path(@project.namespace, @project, wiki_page)
-        %small (#{wiki_page.format})
-        .pull-right
-          %small Last edited #{time_ago_with_tooltip(wiki_page.commit.authored_date)}
+      = link_to wiki_page.title, namespace_project_wiki_path(@project.namespace, @project, wiki_page)
+      %small (#{wiki_page.format})
+      .pull-right
+        %small Last edited #{time_ago_with_tooltip(wiki_page.commit.authored_date)}
 = paginate @wiki_pages, theme: 'gitlab'

app/views/projects/wikis/show.html.haml

 - page_title @page.title.capitalize, "Wiki"
 = render "header_title"
-
 = render 'nav'
 
-.gray-content-block
-  = render 'main_links'
-  %h3.page-title.oneline
-    = @page.title.capitalize
+.top-area
+  .nav-text
+    %strong= @page.title.capitalize
 
     %span.wiki-last-edit-by
       ·
       last edited by #{@page.commit.author.name} #{time_ago_with_tooltip(@page.commit.authored_date)}
 
+  .nav-controls
+    = render 'main_links'
+
 - if @page.historical?
   .warning_message
     This is an old version of this page.