diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-04 14:54:53 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-04 14:54:53 +0000 |
| commit | 1400f197935291ab71650996b476e23c30b9d827 (patch) | |
| tree | 4715889cdc983df70c1692d152536115494cc746 | |
| parent | 954b98377f5e9cdd48bd456d5f49b7f3d0066e5a (diff) | |
| parent | 144f8eff893a13cae171c95efcfc32d99cda3981 (diff) | |
| download | gitlab-ce-1400f197935291ab71650996b476e23c30b9d827.tar.gz | |
Merge branch 'dashboard-search-field-tabindex' into 'master'
Added tabindex to filter field
Based on however I changed the tabindex of the search field so that it goes search field -> filter field & then back to browser default. I dont think we should override the default tabindex of the page too much.
Closes #3706
See merge request !3093
| -rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/_search.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index 4bc761b3738..40f88261c10 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -14,7 +14,7 @@ .nav-controls = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f| - = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control input-short projects-list-filter', spellcheck: false, id: 'project-filter-form-field' + = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control input-short projects-list-filter', spellcheck: false, id: 'project-filter-form-field', tabindex: "2" = render 'explore/projects/dropdown' - if current_user.can_create_project? = link_to new_project_path, class: 'btn btn-new' do diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index 20042e21bf2..54af2c3063c 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -1,6 +1,6 @@ .search = form_tag search_path, method: :get, class: 'navbar-form pull-left' do |f| - = search_field_tag "search", nil, placeholder: 'Search', class: "search-input form-control", spellcheck: false + = search_field_tag "search", nil, placeholder: 'Search', class: "search-input form-control", spellcheck: false, tabindex: "1" = hidden_field_tag :group_id, @group.try(:id) - if @project && @project.persisted? = hidden_field_tag :project_id, @project.id |