BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
db59e735
Commit
db59e735
authored
Feb 28, 2017
by
Sam Rose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Toggle project name if too long
parent
cc64eda9
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
122 additions
and
6 deletions
+122
-6
dispatcher.js
app/assets/javascripts/dispatcher.js
+5
-0
group_name.js
app/assets/javascripts/group_name.js
+40
-0
header.scss
app/assets/stylesheets/framework/header.scss
+22
-0
groups_helper.rb
app/helpers/groups_helper.rb
+6
-5
_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
28187-project-name-cut-off-with-nested-groups.yml
...eleased/28187-project-name-cut-off-with-nested-groups.yml
+4
-0
group_name_toggle.rb
spec/features/groups/group_name_toggle.rb
+44
-0
No files found.
app/assets/javascripts/dispatcher.js
View file @
db59e735
...
@@ -37,6 +37,7 @@ import PrometheusGraph from './monitoring/prometheus_graph'; // TODO: Maybe Make
...
@@ -37,6 +37,7 @@ import PrometheusGraph from './monitoring/prometheus_graph'; // TODO: Maybe Make
import
Issue
from
'./issue'
;
import
Issue
from
'./issue'
;
import
BindInOut
from
'./behaviors/bind_in_out'
;
import
BindInOut
from
'./behaviors/bind_in_out'
;
import
GroupName
from
'./group_name'
;
import
GroupsList
from
'./groups_list'
;
import
GroupsList
from
'./groups_list'
;
import
ProjectsList
from
'./projects_list'
;
import
ProjectsList
from
'./projects_list'
;
import
MiniPipelineGraph
from
'./mini_pipeline_graph_dropdown'
;
import
MiniPipelineGraph
from
'./mini_pipeline_graph_dropdown'
;
...
@@ -342,6 +343,9 @@ const UserCallout = require('./user_callout');
...
@@ -342,6 +343,9 @@ const UserCallout = require('./user_callout');
shortcut_handler
=
new
ShortcutsDashboardNavigation
();
shortcut_handler
=
new
ShortcutsDashboardNavigation
();
new
UserCallout
();
new
UserCallout
();
break
;
break
;
case
'groups'
:
new
GroupName
();
break
;
case
'profiles'
:
case
'profiles'
:
new
NotificationsForm
();
new
NotificationsForm
();
new
NotificationsDropdown
();
new
NotificationsDropdown
();
...
@@ -349,6 +353,7 @@ const UserCallout = require('./user_callout');
...
@@ -349,6 +353,7 @@ const UserCallout = require('./user_callout');
case
'projects'
:
case
'projects'
:
new
Project
();
new
Project
();
new
ProjectAvatar
();
new
ProjectAvatar
();
new
GroupName
();
switch
(
path
[
1
])
{
switch
(
path
[
1
])
{
case
'compare'
:
case
'compare'
:
new
CompareAutocomplete
();
new
CompareAutocomplete
();
...
...
app/assets/javascripts/group_name.js
0 → 100644
View file @
db59e735
const
GROUP_LIMIT
=
2
;
export
default
class
GroupName
{
constructor
()
{
this
.
titleContainer
=
document
.
querySelector
(
'.title'
);
this
.
groups
=
document
.
querySelectorAll
(
'.group-path'
);
this
.
groupTitle
=
document
.
querySelector
(
'.group-title'
);
this
.
toggle
=
null
;
this
.
isHidden
=
false
;
this
.
init
();
}
init
()
{
if
(
this
.
groups
.
length
>
GROUP_LIMIT
)
{
this
.
groups
[
this
.
groups
.
length
-
1
].
classList
.
remove
(
'hidable'
);
this
.
addToggle
();
}
this
.
render
();
}
addToggle
()
{
const
header
=
document
.
querySelector
(
'.header-content'
);
this
.
toggle
=
document
.
createElement
(
'button'
);
this
.
toggle
.
className
=
'text-expander group-name-toggle'
;
this
.
toggle
.
setAttribute
(
'aria-label'
,
'Toggle full path'
);
this
.
toggle
.
innerHTML
=
'...'
;
this
.
toggle
.
addEventListener
(
'click'
,
this
.
toggleGroups
.
bind
(
this
));
header
.
insertBefore
(
this
.
toggle
,
this
.
titleContainer
);
this
.
toggleGroups
();
}
toggleGroups
()
{
this
.
isHidden
=
!
this
.
isHidden
;
this
.
groupTitle
.
classList
.
toggle
(
'is-hidden'
);
}
render
()
{
this
.
titleContainer
.
classList
.
remove
(
'initializing'
);
}
}
app/assets/stylesheets/framework/header.scss
View file @
db59e735
...
@@ -164,11 +164,25 @@ header {
...
@@ -164,11 +164,25 @@ header {
}
}
}
}
.group-name-toggle
{
margin
:
0
5px
;
vertical-align
:
sub
;
}
.group-title
{
&
.is-hidden
{
.hidable
:not
(
:last-of-type
)
{
display
:
none
;
}
}
}
.title
{
.title
{
position
:
relative
;
position
:
relative
;
padding-right
:
20px
;
padding-right
:
20px
;
margin
:
0
;
margin
:
0
;
font-size
:
18px
;
font-size
:
18px
;
max-width
:
385px
;
display
:
inline-block
;
display
:
inline-block
;
line-height
:
$header-height
;
line-height
:
$header-height
;
font-weight
:
normal
;
font-weight
:
normal
;
...
@@ -178,6 +192,14 @@ header {
...
@@ -178,6 +192,14 @@ header {
vertical-align
:
top
;
vertical-align
:
top
;
white-space
:
nowrap
;
white-space
:
nowrap
;
&
.initializing
{
display
:
none
;
}
@media
(
min-width
:
$screen-sm-min
)
and
(
max-width
:
$screen-sm-max
)
{
max-width
:
300px
;
}
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
max-width
:
190px
;
max-width
:
190px
;
}
}
...
...
app/helpers/groups_helper.rb
View file @
db59e735
...
@@ -12,17 +12,18 @@ module GroupsHelper
...
@@ -12,17 +12,18 @@ module GroupsHelper
end
end
def
group_title
(
group
,
name
=
nil
,
url
=
nil
)
def
group_title
(
group
,
name
=
nil
,
url
=
nil
)
@has_group_title
=
true
full_title
=
''
full_title
=
''
group
.
ancestors
.
each
do
|
parent
|
group
.
ancestors
.
each
do
|
parent
|
full_title
+=
link_to
(
simple_sanitize
(
parent
.
name
),
group_path
(
parent
))
full_title
+=
link_to
(
simple_sanitize
(
parent
.
name
),
group_path
(
parent
)
,
class:
'group-path hidable'
)
full_title
+=
'
/
'
.
html_safe
full_title
+=
'
<span class="hidable"> / </span>
'
.
html_safe
end
end
full_title
+=
link_to
(
simple_sanitize
(
group
.
name
),
group_path
(
group
))
full_title
+=
link_to
(
simple_sanitize
(
group
.
name
),
group_path
(
group
)
,
class:
'group-path'
)
full_title
+=
' · '
.
html_safe
+
link_to
(
simple_sanitize
(
name
),
url
)
if
name
full_title
+=
' · '
.
html_safe
+
link_to
(
simple_sanitize
(
name
),
url
,
class:
'group-path'
)
if
name
content_tag
:span
do
content_tag
:span
,
class:
'group-title'
do
full_title
.
html_safe
full_title
.
html_safe
end
end
end
end
...
...
app/views/layouts/header/_default.html.haml
View file @
db59e735
...
@@ -67,7 +67,7 @@
...
@@ -67,7 +67,7 @@
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'logo'
do
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'logo'
do
=
brand_header_logo
=
brand_header_logo
%h1
.title
=
title
%h1
.title
{
class:
(
'initializing'
if
@has_group_title
)
}
=
title
=
yield
:header_content
=
yield
:header_content
...
...
changelogs/unreleased/28187-project-name-cut-off-with-nested-groups.yml
0 → 100644
View file @
db59e735
---
title
:
Use toggle button to expand / collapse mulit-nested groups
merge_request
:
9501
author
:
spec/features/groups/group_name_toggle.rb
0 → 100644
View file @
db59e735
require
'spec_helper'
feature
'Group name toggle'
,
js:
true
do
let
(
:group
)
{
create
(
:group
)
}
let
(
:nested_group_1
)
{
create
(
:group
,
parent:
group
)
}
let
(
:nested_group_2
)
{
create
(
:group
,
parent:
nested_group_1
)
}
let
(
:nested_group_3
)
{
create
(
:group
,
parent:
nested_group_2
)
}
before
do
login_as
:user
end
it
'is not present for less than 3 groups'
do
visit
group_path
(
group
)
expect
(
page
).
not_to
have_css
(
'.group-name-toggle'
)
visit
group_path
(
nested_group_1
)
expect
(
page
).
not_to
have_css
(
'.group-name-toggle'
)
end
it
'is present for nested group of 3 or more in the namespace'
do
visit
group_path
(
nested_group_2
)
expect
(
page
).
to
have_css
(
'.group-name-toggle'
)
visit
group_path
(
nested_group_3
)
expect
(
page
).
to
have_css
(
'.group-name-toggle'
)
end
context
'for group with at least 3 groups'
do
before
do
visit
group_path
(
nested_group_2
)
end
it
'should show the full group namespace when toggled'
do
expect
(
page
).
not_to
have_content
(
group
.
name
)
expect
(
page
).
to
have_css
(
'.group-path.hidable'
,
visible:
false
)
click_button
'...'
expect
(
page
).
to
have_content
(
group
.
name
)
expect
(
page
).
to
have_css
(
'.group-path.hidable'
,
visible:
true
)
end
end
end
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