Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

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

Conflicts:
	app/views/layouts/_head_panel.html.haml

14 files changed, 197 insertions, 264 deletions

diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 98d3e00153d..87e7c9634e9 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -42,11 +42,11 @@
       = f.label :default_branch_protection, class: 'control-label col-sm-2'
       .col-sm-10
         = f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control'
-    .form-group
+    .form-group.project-visibility-level-holder
       = f.label :default_project_visibility, class: 'control-label col-sm-2'
       .col-sm-10
         = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: 'Project')
-    .form-group
+    .form-group.project-visibility-level-holder
       = f.label :default_snippet_visibility, class: 'control-label col-sm-2'
       .col-sm-10
         = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: 'Snippet')
diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml
index 34ca7776c9e..cdbfc60f9a4 100644
--- a/app/views/admin/services/_form.html.haml
+++ b/app/views/admin/services/_form.html.haml
@@ -4,79 +4,7 @@
 %p #{@service.description} template
 
 = form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'form-horizontal fieldset-form' } do |form|
-  - if @service.errors.any?
-    #error_explanation
-      .alert.alert-danger
-        - @service.errors.full_messages.each do |msg|
-          %p= msg
-  - if @service.help.present?
-    .well
-      = preserve do
-        = markdown @service.help
-
-  .form-group
-    = form.label :active, "Active", class: "control-label"
-    .col-sm-10
-      = form.check_box :active
-
-  - if @service.supported_events.length > 1
-    .form-group
-      = form.label :url, "Trigger", class: 'control-label'
-      .col-sm-10
-        - if @service.supported_events.include?("push")
-          %div
-            = form.check_box :push_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :push_events, class: 'list-label' do
-                %strong Push events
-              %p.light
-                This url will be triggered by a push to the repository
-        - if @service.supported_events.include?("tag_push")
-          %div
-            = form.check_box :tag_push_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :tag_push_events, class: 'list-label' do
-                %strong Tag push events
-              %p.light
-                This url will be triggered when a new tag is pushed to the repository
-        - if @service.supported_events.include?("note")
-          %div
-            = form.check_box :note_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :note_events, class: 'list-label' do
-                %strong Comments
-              %p.light
-                This url will be triggered when someone adds a comment
-        - if @service.supported_events.include?("issue")
-          %div
-            = form.check_box :issues_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :issues_events, class: 'list-label' do
-                %strong Issues events
-              %p.light
-                This url will be triggered when an issue is created
-        - if @service.supported_events.include?("merge_request")
-          %div
-            = form.check_box :merge_requests_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :merge_requests_events, class: 'list-label' do
-                %strong Merge Request events
-              %p.light
-                This url will be triggered when a merge request is created
-
-  - @service.fields.each do |field|
-    - type = field[:type]
-
-    - if type == 'fieldset'
-      - fields = field[:fields]
-      - legend = field[:legend]
-
-      %fieldset
-        %legend= legend
-        - fields.each do |subfield|
-          = render 'shared/field', form: form, field: subfield
-    - else
-      = render 'shared/field', form: form, field: field
+  = render 'shared/service_settings', form: form
 
   .form-actions
     = form.submit 'Save', class: 'btn btn-save'
diff --git a/app/views/layouts/search.html.haml b/app/views/layouts/search.html.haml
index f9d8db06e10..4b526686be4 100644
--- a/app/views/layouts/search.html.haml
+++ b/app/views/layouts/search.html.haml
@@ -2,9 +2,5 @@
 %html{ lang: "en"}
   = render "layouts/head", title: "Search"
   %body{class: "#{app_theme}  application", :'data-page' => body_data_page}
-    = render "layouts/broadcast"
     = render "layouts/head_panel", title: link_to("Search", search_path)
-    .container.navless-container
-      .content
-        = render "layouts/flash"
-        = yield
+    = render 'layouts/page'
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 1b465e3addd..e1823b51198 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -11,80 +11,7 @@
 %hr
 
 = form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
-  - if @service.errors.any?
-    .alert.alert-danger
-      %ul
-        - @service.errors.full_messages.each do |msg|
-          %li= msg
-
-  - if @service.help.present?
-    .well
-      = preserve do
-        = markdown @service.help
-
-  .form-group
-    = form.label :active, "Active", class: "control-label"
-    .col-sm-10
-      = form.check_box :active
-
-  - if @service.supported_events.length > 1
-    .form-group
-      = form.label :url, "Trigger", class: 'control-label'
-      .col-sm-10
-        - if @service.supported_events.include?("push")
-          %div
-            = form.check_box :push_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :push_events, class: 'list-label' do
-                %strong Push events
-              %p.light
-                This url will be triggered by a push to the repository
-        - if @service.supported_events.include?("tag_push")
-          %div
-            = form.check_box :tag_push_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :tag_push_events, class: 'list-label' do
-                %strong Tag push events
-              %p.light
-                This url will be triggered when a new tag is pushed to the repository
-        - if @service.supported_events.include?("note")
-          %div
-            = form.check_box :note_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :note_events, class: 'list-label' do
-                %strong Comments
-              %p.light
-                This url will be triggered when someone adds a comment
-        - if @service.supported_events.include?("issue")
-          %div
-            = form.check_box :issues_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :issues_events, class: 'list-label' do
-                %strong Issues events
-              %p.light
-                This url will be triggered when an issue is created
-        - if @service.supported_events.include?("merge_request")
-          %div
-            = form.check_box :merge_requests_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :merge_requests_events, class: 'list-label' do
-                %strong Merge Request events
-              %p.light
-                This url will be triggered when a merge request is created
-
-  - @service.fields.each do |field|
-    - type = field[:type]
-
-    - if type == 'fieldset'
-      - fields = field[:fields]
-      - legend = field[:legend]
-
-      %fieldset
-        %legend= legend
-        - fields.each do |subfield|
-          = render 'shared/field', form: form, field: subfield
-    - else
-      = render 'shared/field', form: form, field: field
+  = render 'shared/service_settings', form: form
 
   .form-actions
     = form.submit 'Save', class: 'btn btn-save'
diff --git a/app/views/search/_category.html.haml b/app/views/search/_category.html.haml
new file mode 100644
index 00000000000..154332cb9a9
--- /dev/null
+++ b/app/views/search/_category.html.haml
@@ -0,0 +1,77 @@
+%ul.nav.nav-pills.search-filter
+  - if @project
+    %li{class: ("active" if @scope == 'blobs')}
+      = link_to search_filter_path(scope: 'blobs') do
+        = icon('code fw')
+        %span
+          Code
+          %span.badge
+            = @search_results.blobs_count
+    %li{class: ("active" if @scope == 'issues')}
+      = link_to search_filter_path(scope: 'issues') do
+        = icon('exclamation-circle fw')
+        %span
+          Issues
+          %span.badge
+            = @search_results.issues_count
+    %li{class: ("active" if @scope == 'merge_requests')}
+      = link_to search_filter_path(scope: 'merge_requests') do
+        = icon('tasks fw')
+        %span
+          Merge requests
+          %span.badge
+            = @search_results.merge_requests_count
+    %li{class: ("active" if @scope == 'notes')}
+      = link_to search_filter_path(scope: 'notes') do
+        = icon('comments fw')
+        %span
+          Comments
+          %span.badge
+            = @search_results.notes_count
+    %li{class: ("active" if @scope == 'wiki_blobs')}
+      = link_to search_filter_path(scope: 'wiki_blobs') do
+        = icon('book fw')
+        %span
+          Wiki
+          %span.badge
+            = @search_results.wiki_blobs_count
+
+  - elsif @show_snippets
+    %li{class: ("active" if @scope == 'snippet_blobs')}
+      = link_to search_filter_path(scope: 'snippet_blobs', snippets: true, group_id: nil, project_id: nil) do
+        = icon('code fw')
+        %span
+          Snippet Contents
+          %span.badge
+            = @search_results.snippet_blobs_count
+    %li{class: ("active" if @scope == 'snippet_titles')}
+      = link_to search_filter_path(scope: 'snippet_titles', snippets: true, group_id: nil, project_id: nil) do
+        = icon('book fw')
+        %span
+          Titles and Filenames
+          %span.badge
+            = @search_results.snippet_titles_count
+
+  - else
+    %li{class: ("active" if @scope == 'projects')}
+      = link_to search_filter_path(scope: 'projects') do
+        = icon('bookmark fw')
+        %span
+          Projects
+          %span.badge
+            = @search_results.projects_count
+    %li{class: ("active" if @scope == 'issues')}
+      = link_to search_filter_path(scope: 'issues') do
+        = icon('exclamation-circle fw')
+        %span
+          Issues
+          %span.badge
+            = @search_results.issues_count
+    %li{class: ("active" if @scope == 'merge_requests')}
+      = link_to search_filter_path(scope: 'merge_requests') do
+        = icon('tasks fw')
+        %span
+          Merge requests
+          %span.badge
+            = @search_results.merge_requests_count
+
diff --git a/app/views/search/_filter.html.haml b/app/views/search/_filter.html.haml
index ffc145497ab..e2d0cab9e79 100644
--- a/app/views/search/_filter.html.haml
+++ b/app/views/search/_filter.html.haml
@@ -1,5 +1,5 @@
 .dropdown.inline
-  %button.dropdown-toggle.btn.btn-sm{type: 'button', 'data-toggle' => 'dropdown'}
+  %button.dropdown-toggle.btn.btn{type: 'button', 'data-toggle' => 'dropdown'}
     %i.fa.fa-tags
     %span.light Group:
     - if @group.present?
@@ -17,7 +17,7 @@
           = group.name
 
 .dropdown.inline.prepend-left-10.project-filter
-  %button.dropdown-toggle.btn.btn-sm{type: 'button', 'data-toggle' => 'dropdown'}
+  %button.dropdown-toggle.btn.btn{type: 'button', 'data-toggle' => 'dropdown'}
     %i.fa.fa-tags
     %span.light Project:
     - if @project.present?
diff --git a/app/views/search/_form.html.haml b/app/views/search/_form.html.haml
new file mode 100644
index 00000000000..47016daf1f0
--- /dev/null
+++ b/app/views/search/_form.html.haml
@@ -0,0 +1,12 @@
+= form_tag search_path, method: :get, class: 'form-inline' do |f|
+  = hidden_field_tag :project_id, params[:project_id]
+  = hidden_field_tag :group_id, params[:group_id]
+  = hidden_field_tag :snippets, params[:snippets]
+  = hidden_field_tag :scope, params[:scope]
+  .search-holder.clearfix
+    .form-group
+      = search_field_tag :search, params[:search], placeholder: "Search for projects, issues etc", class: "form-control search-text-input input-mn-300", id: "dashboard_search", autofocus: true
+      = button_tag 'Search', class: "btn btn-primary"
+    - unless params[:snippets].eql? 'true'
+      .pull-right
+        = render 'filter'
diff --git a/app/views/search/_global_filter.html.haml b/app/views/search/_global_filter.html.haml
deleted file mode 100644
index 442bd84f930..00000000000
--- a/app/views/search/_global_filter.html.haml
+++ /dev/null
@@ -1,16 +0,0 @@
-%ul.nav.nav-pills.nav-stacked.search-filter
-  %li{class: ("active" if @scope == 'projects')}
-    = link_to search_filter_path(scope: 'projects') do
-      Projects
-      .pull-right
-        = @search_results.projects_count
-  %li{class: ("active" if @scope == 'issues')}
-    = link_to search_filter_path(scope: 'issues') do
-      Issues
-      .pull-right
-        = @search_results.issues_count
-  %li{class: ("active" if @scope == 'merge_requests')}
-    = link_to search_filter_path(scope: 'merge_requests') do
-      Merge requests
-      .pull-right
-        = @search_results.merge_requests_count
diff --git a/app/views/search/_project_filter.html.haml b/app/views/search/_project_filter.html.haml
deleted file mode 100644
index ad933502a28..00000000000
--- a/app/views/search/_project_filter.html.haml
+++ /dev/null
@@ -1,32 +0,0 @@
-%ul.nav.nav-pills.nav-stacked.search-filter
-  %li{class: ("active" if @scope == 'blobs')}
-    = link_to search_filter_path(scope: 'blobs') do
-      %i.fa.fa-code
-      Code
-      .pull-right
-        = @search_results.blobs_count
-  %li{class: ("active" if @scope == 'issues')}
-    = link_to search_filter_path(scope: 'issues') do
-      %i.fa.fa-exclamation-circle
-      Issues
-      .pull-right
-        = @search_results.issues_count
-  %li{class: ("active" if @scope == 'merge_requests')}
-    = link_to search_filter_path(scope: 'merge_requests') do
-      %i.fa.fa-code-fork
-      Merge requests
-      .pull-right
-        = @search_results.merge_requests_count
-  %li{class: ("active" if @scope == 'notes')}
-    = link_to search_filter_path(scope: 'notes') do
-      %i.fa.fa-comments
-      Comments
-      .pull-right
-        = @search_results.notes_count
-  %li{class: ("active" if @scope == 'wiki_blobs')}
-    = link_to search_filter_path(scope: 'wiki_blobs') do
-      %i.fa.fa-book
-      Wiki
-      .pull-right
-        = @search_results.wiki_blobs_count
-
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml
index 796dd752a4c..741c780ad96 100644
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@@ -1,28 +1,21 @@
-%h4
-  #{@search_results.total_count} results found
-  - unless @show_snippets
-    - if @project
-      for #{link_to @project.name_with_namespace, [@project.namespace.becomes(Namespace), @project]}
-    - elsif @group
-      for #{link_to @group.name, @group}
+- if @search_results.empty?
+  = render partial: "search/results/empty"
+- else
+  .light
+    Search results for
+    %code
+      = @search_term
+    - unless @show_snippets
+      - if @project
+        in project #{link_to @project.name_with_namespace, [@project.namespace.becomes(Namespace), @project]}
+      - elsif @group
+        in group #{link_to @group.name, @group}
 
-%hr
-
-.row
-  .col-sm-3
-    - if @project
-      = render "project_filter"
-    - elsif @show_snippets
-      = render 'snippet_filter'
-    - else
-      = render "global_filter"
-  .col-sm-9
+  %br
+  .results.prepend-top-10
     .search-results
-      - if @search_results.empty?
-        = render partial: "search/results/empty", locals: { message: "We couldn't find any matching results" }
-      - else
-        = render partial: "search/results/#{@scope.singularize}", collection: @objects
-        = paginate @objects, theme: 'gitlab'
+      = render partial: "search/results/#{@scope.singularize}", collection: @objects
+      = paginate @objects, theme: 'gitlab'
 
 :javascript
   $(".search-results .term").highlight("#{escape_javascript(params[:search])}");
diff --git a/app/views/search/_snippet_filter.html.haml b/app/views/search/_snippet_filter.html.haml
deleted file mode 100644
index 95d23fa9f47..00000000000
--- a/app/views/search/_snippet_filter.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-%ul.nav.nav-pills.nav-stacked.search-filter
-  %li{class: ("active" if @scope == 'snippet_blobs')}
-    = link_to search_filter_path(scope: 'snippet_blobs', snippets: true, group_id: nil, project_id: nil) do
-      %i.fa.fa-code
-      Snippet Contents
-      .pull-right
-        = @search_results.snippet_blobs_count
-  %li{class: ("active" if @scope == 'snippet_titles')}
-    = link_to search_filter_path(scope: 'snippet_titles', snippets: true, group_id: nil, project_id: nil) do
-      %i.fa.fa-book
-      Titles and Filenames
-      .pull-right
-        = @search_results.snippet_titles_count
diff --git a/app/views/search/results/_empty.html.haml b/app/views/search/results/_empty.html.haml
index 01fb8cd9b8e..05a63016c09 100644
--- a/app/views/search/results/_empty.html.haml
+++ b/app/views/search/results/_empty.html.haml
@@ -1,4 +1,6 @@
 .search_box
   .search_glyph
-    %span.fa.fa-search
-  %h4 #{message}
+  %h4
+    = icon('search')
+    We couldn't find any results matching
+    %code #{@search_term}
diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml
index 5b4816e4c40..e9f2711be2a 100644
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
@@ -1,22 +1,6 @@
-= form_tag search_path, method: :get, class: 'form-horizontal' do |f|
-  .search-holder.clearfix
-    .form-group
-      = label_tag :search, class: 'control-label' do
-        %span Looking for
-      .col-sm-6
-        = search_field_tag :search, params[:search], placeholder: "issue 143", class: "form-control search-text-input", id: "dashboard_search"
-      .col-sm-4
-        = button_tag 'Search', class: "btn btn-create"
-    .form-group
-      .col-sm-2
-      - unless params[:snippets].eql? 'true'
-        .col-sm-10
-          = render 'filter', f: f
-      = hidden_field_tag :project_id, params[:project_id]
-      = hidden_field_tag :group_id, params[:group_id]
-      = hidden_field_tag :snippets, params[:snippets]
-      = hidden_field_tag :scope, params[:scope]
-
-  .results.prepend-top-10
-    - if params[:search].present?
-      = render 'search/results'
+= render 'search/form'
+%hr
+- if @search_term
+  = render 'search/category'
+  %hr
+  = render 'search/results'
diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml
new file mode 100644
index 00000000000..16a98a7233c
--- /dev/null
+++ b/app/views/shared/_service_settings.html.haml
@@ -0,0 +1,75 @@
+- if @service.errors.any?
+  #error_explanation
+    .alert.alert-danger
+      %ul
+        - @service.errors.full_messages.each do |msg|
+          %li= msg
+
+- if @service.help.present?
+  .well
+    = preserve do
+      = markdown @service.help
+
+.form-group
+  = form.label :active, "Active", class: "control-label"
+  .col-sm-10
+    = form.check_box :active
+
+- if @service.supported_events.length > 1
+  .form-group
+    = form.label :url, "Trigger", class: 'control-label'
+    .col-sm-10
+      - if @service.supported_events.include?("push")
+        %div
+          = form.check_box :push_events, class: 'pull-left'
+          .prepend-left-20
+            = form.label :push_events, class: 'list-label' do
+              %strong Push events
+            %p.light
+              This url will be triggered by a push to the repository
+      - if @service.supported_events.include?("tag_push")
+        %div
+          = form.check_box :tag_push_events, class: 'pull-left'
+          .prepend-left-20
+            = form.label :tag_push_events, class: 'list-label' do
+              %strong Tag push events
+            %p.light
+              This url will be triggered when a new tag is pushed to the repository
+      - if @service.supported_events.include?("note")
+        %div
+          = form.check_box :note_events, class: 'pull-left'
+          .prepend-left-20
+            = form.label :note_events, class: 'list-label' do
+              %strong Comments
+            %p.light
+              This url will be triggered when someone adds a comment
+      - if @service.supported_events.include?("issue")
+        %div
+          = form.check_box :issues_events, class: 'pull-left'
+          .prepend-left-20
+            = form.label :issues_events, class: 'list-label' do
+              %strong Issues events
+            %p.light
+              This url will be triggered when an issue is created
+      - if @service.supported_events.include?("merge_request")
+        %div
+          = form.check_box :merge_requests_events, class: 'pull-left'
+          .prepend-left-20
+            = form.label :merge_requests_events, class: 'list-label' do
+              %strong Merge Request events
+            %p.light
+              This url will be triggered when a merge request is created
+
+- @service.fields.each do |field|
+  - type = field[:type]
+
+  - if type == 'fieldset'
+    - fields = field[:fields]
+    - legend = field[:legend]
+
+    %fieldset
+      %legend= legend
+      - fields.each do |subfield|
+        = render 'shared/field', form: form, field: subfield
+  - else
+    = render 'shared/field', form: form, field: field