diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-07-26 15:49:26 -0600 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-08-26 14:50:52 -0500 |
| commit | 33af01f3670bbed069135f50950633eb23ccb988 (patch) | |
| tree | 165ad74d76567e833ddc310c023e9fd314efda59 /app/views/layouts/_search.html.haml | |
| parent | 909d2d8b3144f5b25652547758aa237474e5b4a2 (diff) | |
| download | gitlab-ce-33af01f3670bbed069135f50950633eb23ccb988.tar.gz | |
Move data attribute information to relevant elements.
Diffstat (limited to 'app/views/layouts/_search.html.haml')
| -rw-r--r-- | app/views/layouts/_search.html.haml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index ca9d7ac8a60..ff4aac0092d 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -2,6 +2,10 @@ - label = 'This group' - if controller.controller_path =~ /^projects/ && @project.persisted? - label = 'This project' +- if @group && @group.persisted? && @group.path + - group_data_attrs = { group_path: "#{j(@group.path)}", name: "#{j(@group.name)}", issues_path: "#{issues_group_path(j(@group.path))}", mr_path: "#{merge_requests_group_path(j(@group.path))}" } +- if @project && @project.persisted? + - project_data_attrs = { project_path: "#{j(@project.path)}", name: "#{j(@project.name)}", issues_path: "#{namespace_project_issues_path(@project.namespace, @project)}", mr_path: "#{namespace_project_merge_requests_path(@project.namespace, @project)}" } .search.search-form{class: "#{'has-location-badge' if label.present?}"} = form_tag search_path, method: :get, class: 'navbar-form' do |f| @@ -9,8 +13,8 @@ - if label.present? .location-badge= label .search-input-wrap - .dropdown{ data: {url: search_autocomplete_path } } - = search_field_tag "search", nil, placeholder: 'Search', class: "search-input dropdown-menu-toggle", spellcheck: false, tabindex: "1", autocomplete: 'off', data: { toggle: 'dropdown' } + .dropdown{ data: { url: search_autocomplete_path } } + = search_field_tag "search", nil, placeholder: 'Search', class: "search-input dropdown-menu-toggle js-search-dashboard-options", spellcheck: false, tabindex: "1", autocomplete: 'off', data: { toggle: 'dropdown', issues_path: "#{issues_dashboard_url}", mr_path: "#{merge_requests_dashboard_url}" } .dropdown-menu.dropdown-select = dropdown_content do %ul @@ -21,8 +25,9 @@ %i.search-icon %i.clear-icon.js-clear-input - = hidden_field_tag :group_id, @group.try(:id) - = hidden_field_tag :project_id, @project && @project.persisted? ? @project.id : '', id: 'search_project_id' + = hidden_field_tag :group_id, @group.try(:id), class: 'js-search-group-options', data: group_data_attrs + + = hidden_field_tag :project_id, @project && @project.persisted? ? @project.id : '', id: 'search_project_id', class: 'js-search-project-options', data: project_data_attrs - if @project && @project.persisted? - if current_controller?(:issues) @@ -36,13 +41,6 @@ - else = hidden_field_tag :search_code, true - .js-search-project-options{ data: { project_path: "#{j(@project.path)}", name: "#{j(@project.name)}", issues_path: "#{namespace_project_issues_path(@project.namespace, @project)}", mr_path: "#{namespace_project_merge_requests_path(@project.namespace, @project)}" } } - - - if @group && @group.persisted? && @group.path - .js-search-group-options{ data: { group_path: "#{j(@group.path)}", name: "#{j(@group.name)}", issues_path: "#{issues_group_path(j(@group.path))}", mr_path: "#{merge_requests_group_path(j(@group.path))}" } } - - .js-search-dashboard-options{ data: { issues_path: "#{issues_dashboard_url}", mr_path: "#{merge_requests_dashboard_url}" } } - - if @snippet || @snippets = hidden_field_tag :snippets, true = hidden_field_tag :repository_ref, @ref |