Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6416f8ea
Commit
6416f8ea
authored
Apr 04, 2016
by
Phil Hughes
Committed by
Jacob Schatz
Apr 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated based on Ruby feedback
parent
14b124fa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
19 deletions
+21
-19
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+2
-2
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+6
-5
spec/javascripts/fixtures/project_title.html.haml
spec/javascripts/fixtures/project_title.html.haml
+13
-12
No files found.
app/helpers/projects_helper.rb
View file @
6416f8ea
...
@@ -66,10 +66,10 @@ module ProjectsHelper
...
@@ -66,10 +66,10 @@ module ProjectsHelper
end
end
project_link
=
link_to
simple_sanitize
(
project
.
name
),
project_path
(
project
),
{
class:
"project-item-select-holder"
}
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
=
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
full_title
end
end
...
...
app/views/layouts/project.html.haml
View file @
6416f8ea
...
@@ -18,10 +18,11 @@
...
@@ -18,10 +18,11 @@
=
render
"layouts/init_auto_complete"
if
current_user
=
render
"layouts/init_auto_complete"
if
current_user
-
content_for
:header_content
do
-
content_for
:header_content
do
.dropdown-menu.dropdown-select.dropdown-menu-projects
.js-dropdown-menu-projects
=
dropdown_title
(
"Go to a project"
)
.dropdown-menu.dropdown-select.dropdown-menu-projects
=
dropdown_filter
(
"Search your projects"
)
=
dropdown_title
(
"Go to a project"
)
=
dropdown_content
=
dropdown_filter
(
"Search your projects"
)
=
dropdown_loading
=
dropdown_content
=
dropdown_loading
=
render
template:
"layouts/application"
=
render
template:
"layouts/application"
spec/javascripts/fixtures/project_title.html.haml
View file @
6416f8ea
...
@@ -5,15 +5,16 @@
...
@@ -5,15 +5,16 @@
%a
.project-item-select-holder
{
href:
"/gitlab-org/gitlab-test"
}
%a
.project-item-select-holder
{
href:
"/gitlab-org/gitlab-test"
}
GitLab Test
GitLab Test
%i
.fa.chevron-down.dropdown-toggle-caret.js-projects-dropdown-toggle
{
"data-toggle"
=>
"dropdown"
,
"data-target"
=>
".header-content"
}
%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
.js-dropdown-menu-projects
.dropdown-title
.dropdown-menu.dropdown-select.dropdown-menu-projects
%span
Go to a project
.dropdown-title
%button
.dropdown-title-button.dropdown-menu-close
{
"aria-label"
=>
"Close"
,
type:
"button"
}
%span
Go to a project
%i
.fa.fa-times.dropdown-menu-close-icon
%button
.dropdown-title-button.dropdown-menu-close
{
"aria-label"
=>
"Close"
,
type:
"button"
}
.dropdown-input
%i
.fa.fa-times.dropdown-menu-close-icon
%input
.dropdown-input-field
{
id:
""
,
placeholder:
"Search your projects"
,
type:
"search"
,
value:
""
}
.dropdown-input
%i
.fa.fa-search.dropdown-input-search
%input
.dropdown-input-field
{
id:
""
,
placeholder:
"Search your projects"
,
type:
"search"
,
value:
""
}
%i
.fa.fa-times.dropdown-input-clear.js-dropdown-input-clear
{
role:
"button"
}
%i
.fa.fa-search.dropdown-input-search
.dropdown-content
%i
.fa.fa-times.dropdown-input-clear.js-dropdown-input-clear
{
role:
"button"
}
.dropdown-loading
.dropdown-content
%i
.fa.fa-spinner.fa-spin
.dropdown-loading
%i
.fa.fa-spinner.fa-spin
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment