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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
81e7086f
Commit
81e7086f
authored
Jan 15, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
uses AJAX to select the projects
parent
14394e8b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
44 deletions
+20
-44
app/assets/javascripts/project.js.coffee
app/assets/javascripts/project.js.coffee
+10
-0
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+2
-2
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+0
-22
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+4
-16
app/views/shared/_new_project_item_select.html.haml
app/views/shared/_new_project_item_select.html.haml
+4
-4
No files found.
app/assets/javascripts/project.js.coffee
View file @
81e7086f
...
@@ -50,3 +50,13 @@ class @Project
...
@@ -50,3 +50,13 @@ class @Project
$
(
'#notifications-button'
).
empty
().
append
(
"<i class='fa fa-bell'></i>"
+
label
+
"<i class='fa fa-angle-down'></i>"
)
$
(
'#notifications-button'
).
empty
().
append
(
"<i class='fa fa-bell'></i>"
+
label
+
"<i class='fa fa-angle-down'></i>"
)
$
(
@
).
parents
(
'ul'
).
find
(
'li.active'
).
removeClass
'active'
$
(
@
).
parents
(
'ul'
).
find
(
'li.active'
).
removeClass
'active'
$
(
@
).
parent
().
addClass
'active'
$
(
@
).
parent
().
addClass
'active'
@
.
_projectSelectDropdown
()
_projectSelectDropdown
:
->
new
ProjectSelect
()
$
(
'.js-projects-dropdown-toggle'
).
on
'click'
,
(
e
)
->
e
.
preventDefault
()
$
(
'.js-projects-dropdown'
).
select2
'open'
app/assets/stylesheets/framework/common.scss
View file @
81e7086f
...
@@ -376,11 +376,11 @@ table {
...
@@ -376,11 +376,11 @@ table {
margin-bottom
:
$gl-padding
;
margin-bottom
:
$gl-padding
;
}
}
.
new-
project-item-select-holder
{
.project-item-select-holder
{
display
:
inline-block
;
display
:
inline-block
;
position
:
relative
;
position
:
relative
;
.
new-
project-item-select
{
.project-item-select
{
position
:
absolute
;
position
:
absolute
;
top
:
0
;
top
:
0
;
right
:
0
;
right
:
0
;
...
...
app/assets/stylesheets/framework/header.scss
View file @
81e7086f
...
@@ -88,34 +88,12 @@ header {
...
@@ -88,34 +88,12 @@ header {
}
}
}
}
.dropdown
{
display
:
inline-block
;
}
.dropdown-menu
{
max-height
:
300px
;
overflow
:
auto
;
}
.dropdown-toggle-caret
{
.dropdown-toggle-caret
{
position
:
relative
;
position
:
relative
;
top
:
-2px
;
top
:
-2px
;
margin-left
:
5px
;
margin-left
:
5px
;
font-size
:
10px
;
font-size
:
10px
;
}
}
.dropdown-item
{
&
.active
{
.dropdown-link
{
color
:
#fff
;
}
}
.dropdown-link
:hover
{
color
:
#fff
;
text-decoration
:
none
;
}
}
}
}
.navbar-collapse
{
.navbar-collapse
{
...
...
app/helpers/projects_helper.rb
View file @
81e7086f
...
@@ -56,23 +56,11 @@ module ProjectsHelper
...
@@ -56,23 +56,11 @@ module ProjectsHelper
all_projects
=
current_user
.
authorized_projects
.
sorted_by_activity
.
non_archived
all_projects
=
current_user
.
authorized_projects
.
sorted_by_activity
.
non_archived
project_link
=
content_tag
:div
,
{
class:
"dropdown"
}
do
project_link
=
link_to
project_path
(
project
),
{
class:
"project-item-select-holder js-projects-dropdown-toggle"
}
do
output
=
content_tag
:a
,
{
class:
"dropdown-toggle"
,
href:
"#"
,
data:
{
toggle:
"dropdown"
}}
do
link_output
=
simple_sanitize
(
project
.
name
)
btnOutput
=
simple_sanitize
(
project
.
name
)
link_output
+=
content_tag
:span
,
nil
,
{
class:
"fa fa-chevron-down dropdown-toggle-caret"
}
btnOutput
+=
content_tag
:span
,
nil
,
{
class:
"fa fa-chevron-down dropdown-toggle-caret"
}
end
list
=
all_projects
.
map
do
|
project
|
content_tag
:li
,
{
class:
"dropdown-item
#{
"active"
if
project_id
==
project
.
id
}
"
}
do
link_to
project_path
(
project
),
{
class:
"dropdown-link"
}
do
project
.
owner
.
name
+
' / '
+
simple_sanitize
(
project
.
name
)
end
end
end
output
+=
content_tag
:ul
,
{
class:
"dropdown-menu"
}
do
link_output
+=
project_select_tag
:project_path
,
class:
"project-item-select js-projects-dropdown"
,
data:
{
include_groups:
false
}
list
.
join
.
html_safe
end
end
end
full_title
=
namespace_link
+
' / '
+
project_link
full_title
=
namespace_link
+
' / '
+
project_link
...
...
app/views/shared/_new_project_item_select.html.haml
View file @
81e7086f
-
if
@projects
.
any?
-
if
@projects
.
any?
.prepend-left-10.
new-
project-item-select-holder
.prepend-left-10.project-item-select-holder
=
project_select_tag
:project_path
,
class:
"
new-
project-item-select"
,
data:
{
include_groups:
local_assigns
[
:include_groups
]
}
=
project_select_tag
:project_path
,
class:
"project-item-select"
,
data:
{
include_groups:
local_assigns
[
:include_groups
]
}
%a
.btn.btn-new.new-project-item-select-button
%a
.btn.btn-new.new-project-item-select-button
=
icon
(
'plus'
)
=
icon
(
'plus'
)
=
local_assigns
[
:label
]
=
local_assigns
[
:label
]
...
@@ -8,12 +8,12 @@
...
@@ -8,12 +8,12 @@
:javascript
:javascript
$
(
'
.new-project-item-select-button
'
).
on
(
'
click
'
,
function
()
{
$
(
'
.new-project-item-select-button
'
).
on
(
'
click
'
,
function
()
{
$
(
'
.
new-
project-item-select
'
).
select2
(
'
open
'
);
$
(
'
.project-item-select
'
).
select2
(
'
open
'
);
});
});
var
relativePath
=
'
#{
local_assigns
[
:path
]
}
'
;
var
relativePath
=
'
#{
local_assigns
[
:path
]
}
'
;
$
(
'
.
new-
project-item-select
'
).
on
(
'
click
'
,
function
()
{
$
(
'
.project-item-select
'
).
on
(
'
click
'
,
function
()
{
window
.
location
=
$
(
this
).
val
()
+
'
/
'
+
relativePath
;
window
.
location
=
$
(
this
).
val
()
+
'
/
'
+
relativePath
;
});
});
...
...
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