Updated based on Ruby feedback
This commit is contained in:
parent
14b124faca
commit
6416f8eab1
3 changed files with 21 additions and 19 deletions
|
@ -66,10 +66,10 @@ module ProjectsHelper
|
|||
end
|
||||
|
||||
project_link = link_to simple_sanitize(project.name), project_path(project), { class: "project-item-select-holder" }
|
||||
project_link += icon "chevron-down", class: "dropdown-toggle-caret js-projects-dropdown-toggle", data: { target: ".header-content", toggle: "dropdown" } if current_user
|
||||
project_link << icon("chevron-down", class: "dropdown-toggle-caret js-projects-dropdown-toggle", data: { target: ".js-dropdown-menu-projects", toggle: "dropdown" }) if current_user
|
||||
|
||||
full_title = namespace_link + ' / ' + project_link
|
||||
full_title += ' · '.html_safe + link_to(simple_sanitize(name), url) if name
|
||||
full_title << ' · '.html_safe + link_to(simple_sanitize(name), url) if name
|
||||
|
||||
full_title
|
||||
end
|
||||
|
|
|
@ -18,10 +18,11 @@
|
|||
= render "layouts/init_auto_complete" if current_user
|
||||
|
||||
- content_for :header_content do
|
||||
.dropdown-menu.dropdown-select.dropdown-menu-projects
|
||||
= dropdown_title("Go to a project")
|
||||
= dropdown_filter("Search your projects")
|
||||
= dropdown_content
|
||||
= dropdown_loading
|
||||
.js-dropdown-menu-projects
|
||||
.dropdown-menu.dropdown-select.dropdown-menu-projects
|
||||
= dropdown_title("Go to a project")
|
||||
= dropdown_filter("Search your projects")
|
||||
= dropdown_content
|
||||
= dropdown_loading
|
||||
|
||||
= render template: "layouts/application"
|
||||
|
|
|
@ -5,15 +5,16 @@
|
|||
%a.project-item-select-holder{href: "/gitlab-org/gitlab-test"}
|
||||
GitLab Test
|
||||
%i.fa.chevron-down.dropdown-toggle-caret.js-projects-dropdown-toggle{ "data-toggle" => "dropdown", "data-target" => ".header-content" }
|
||||
.dropdown-menu.dropdown-select.dropdown-menu-projects
|
||||
.dropdown-title
|
||||
%span Go to a project
|
||||
%button.dropdown-title-button.dropdown-menu-close{"aria-label" => "Close", type: "button"}
|
||||
%i.fa.fa-times.dropdown-menu-close-icon
|
||||
.dropdown-input
|
||||
%input.dropdown-input-field{id: "", placeholder: "Search your projects", type: "search", value: ""}
|
||||
%i.fa.fa-search.dropdown-input-search
|
||||
%i.fa.fa-times.dropdown-input-clear.js-dropdown-input-clear{role: "button"}
|
||||
.dropdown-content
|
||||
.dropdown-loading
|
||||
%i.fa.fa-spinner.fa-spin
|
||||
.js-dropdown-menu-projects
|
||||
.dropdown-menu.dropdown-select.dropdown-menu-projects
|
||||
.dropdown-title
|
||||
%span Go to a project
|
||||
%button.dropdown-title-button.dropdown-menu-close{"aria-label" => "Close", type: "button"}
|
||||
%i.fa.fa-times.dropdown-menu-close-icon
|
||||
.dropdown-input
|
||||
%input.dropdown-input-field{id: "", placeholder: "Search your projects", type: "search", value: ""}
|
||||
%i.fa.fa-search.dropdown-input-search
|
||||
%i.fa.fa-times.dropdown-input-clear.js-dropdown-input-clear{role: "button"}
|
||||
.dropdown-content
|
||||
.dropdown-loading
|
||||
%i.fa.fa-spinner.fa-spin
|
||||
|
|
Loading…
Reference in a new issue