diff options
| -rw-r--r-- | app/controllers/dashboard_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/dashboard/_filter.html.haml | 6 | ||||
| -rw-r--r-- | app/views/dashboard/issues.html.haml | 8 | ||||
| -rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 8 |
4 files changed, 10 insertions, 14 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 4b9bfcf843b..f6620b25818 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -35,8 +35,6 @@ class DashboardController < ApplicationController current_user.authorized_projects end.sorted_by_activity - @projects = @projects.search(params[:search]) if params[:search].present? - @labels = current_user.authorized_projects.tags_on(:labels) @projects = @projects.tagged_with(params[:label]) if params[:label].present? diff --git a/app/views/dashboard/_filter.html.haml b/app/views/dashboard/_filter.html.haml index df4447cd205..d3208e6aad6 100644 --- a/app/views/dashboard/_filter.html.haml +++ b/app/views/dashboard/_filter.html.haml @@ -1,11 +1,5 @@ = form_tag dashboard_filter_path(entity), method: 'get' do - %fieldset.dashboard-search-filter - = search_field_tag "search", params[:search], { id: 'filter_search', placeholder: 'Search', class: 'search-text-input' } - = button_tag type: 'submit', class: 'btn' do - %i.icon-search - %fieldset - %legend Status: %ul.nav.nav-pills.nav-stacked %li{class: ("active" if !params[:status])} = link_to dashboard_filter_path(entity, status: nil) do diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 356e0847ae7..ad104657fea 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -1,9 +1,11 @@ %h3.page_title Issues - %small (assigned to you) - %small.pull-right #{@issues.total_count} issues + %span.light + – + Assigned to you + %span.pull-right #{@issues.total_count} issues -%hr +%br .row .span3 diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index a311729dd4d..de1c457c318 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -1,9 +1,11 @@ %h3.page_title Merge Requests - %small (authored by or assigned to you) - %small.pull-right #{@merge_requests.total_count} merge requests + %span.light + – + Authored by or assigned to you + %span.pull-right #{@merge_requests.total_count} merge requests -%hr +%br .row .span3 = render 'filter', entity: 'merge_request' |