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
2018e51b
Commit
2018e51b
authored
Mar 10, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved the gear settings dropdown in the group view to a tab
parent
0c5f5ec8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
3 deletions
+31
-3
app/views/groups/_settings_head.html.haml
app/views/groups/_settings_head.html.haml
+14
-0
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+1
-0
app/views/groups/projects.html.haml
app/views/groups/projects.html.haml
+1
-0
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+11
-3
changelogs/unreleased/group-gear-setting-dropdown-to-tab.yml
changelogs/unreleased/group-gear-setting-dropdown-to-tab.yml
+4
-0
No files found.
app/views/groups/_settings_head.html.haml
0 → 100644
View file @
2018e51b
=
content_for
:sub_nav
do
.scrolling-tabs-container.sub-nav-scroll
=
render
'shared/nav_scroll'
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
container_class
}
=
nav_link
(
path:
'groups#projects'
)
do
=
link_to
projects_group_path
(
@group
),
title:
'Projects'
do
%span
Projects
=
nav_link
(
path:
'groups#edit'
)
do
=
link_to
edit_group_path
(
@group
),
title:
'Edit Group'
do
%span
Edit Group
\ No newline at end of file
app/views/groups/edit.html.haml
View file @
2018e51b
=
render
"groups/settings_head"
.panel.panel-default.prepend-top-default
.panel-heading
Group settings
...
...
app/views/groups/projects.html.haml
View file @
2018e51b
-
page_title
"Projects"
=
render
"groups/settings_head"
.panel.panel-default.prepend-top-default
.panel-heading
...
...
app/views/layouts/nav/_group.html.haml
View file @
2018e51b
=
render
'layouts/nav/group_settings'
-
can_admin_group
=
can?
(
current_user
,
:admin_group
,
@group
)
-
can_edit
=
can?
(
current_user
,
:admin_group
,
@group
)
.scrolling-tabs-container
{
class:
nav_control_class
}
.fade-left
=
icon
(
'angle-left'
)
...
...
@@ -25,8 +26,15 @@
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
Members
=
nav_link
(
controller:
[
:stats
])
do
=
nav_link
(
controller:
[
:stats
])
do
=
link_to
group_analytics_path
(
@group
),
title:
'Contribution Analytics'
,
data:
{
placement:
'right'
}
do
%span
Contribution Analytics
-
if
current_user
-
if
can_admin_group
||
can_edit
=
nav_link
(
path:
%w[groups#projects groups#edit]
)
do
=
link_to
projects_group_path
(
@group
),
title:
'Settings'
do
%span
Settings
changelogs/unreleased/group-gear-setting-dropdown-to-tab.yml
0 → 100644
View file @
2018e51b
---
title
:
Moved the gear settings dropdown to a tab in the groups view
merge_request
:
author
:
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