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
Tatuya Kamada
gitlab-ce
Commits
3f12e8d1
Commit
3f12e8d1
authored
Jun 20, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Put some admin settings in dropdown
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
73d43173
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
75 additions
and
71 deletions
+75
-71
app/views/admin/appearances/show.html.haml
app/views/admin/appearances/show.html.haml
+7
-5
app/views/admin/application_settings/_head.html.haml
app/views/admin/application_settings/_head.html.haml
+0
-11
app/views/admin/application_settings/show.html.haml
app/views/admin/application_settings/show.html.haml
+3
-5
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+34
-50
app/views/layouts/nav/_admin_settings.html.haml
app/views/layouts/nav/_admin_settings.html.haml
+31
-0
No files found.
app/views/admin/appearances/show.html.haml
View file @
3f12e8d1
-
@no_container
=
true
-
page_title
"Appearance"
-
page_title
"Appearance"
=
render
"admin/application_settings/head"
%div
{
class:
(
container_class
)
}
%h3
.page-title
.prepend-top-default
Appearance settings
=
render
'form'
%p
.light
You can modify the look and feel of GitLab here
%hr
=
render
'form'
app/views/admin/application_settings/_head.html.haml
deleted
100644 → 0
View file @
73d43173
.nav-links.sub-nav
%ul
{
class:
(
container_class
)
}
=
nav_link
(
controller: :application_settings
)
do
=
link_to
admin_application_settings_path
,
title:
'Settings'
do
%span
General
=
nav_link
(
controller: :appearances
)
do
=
link_to
admin_appearances_path
,
title:
'Appearances'
do
%span
Appearance
app/views/admin/application_settings/show.html.haml
View file @
3f12e8d1
-
@no_container
=
true
-
page_title
"Settings"
-
page_title
"Settings"
=
render
"admin/application_settings/head"
%
div
{
class:
(
container_class
)
}
%
h3
.page-title
Settings
.prepend-top-default
%hr
=
render
'form'
=
render
'form'
app/views/layouts/nav/_admin.html.haml
View file @
3f12e8d1
%ul
.nav-links.scrolling-tabs
%div
{
class:
nav_control_class
}
.fade-left
=
render
'layouts/nav/admin_settings'
=
nav_link
(
controller:
%w(dashboard admin projects users groups builds runners)
,
html_options:
{
class:
'home'
})
do
=
link_to
admin_root_path
,
title:
'Overview'
,
class:
'shortcuts-tree'
do
%span
Overview
=
nav_link
(
controller:
%w(background_jobs logs health_check)
)
do
=
link_to
admin_background_jobs_path
,
title:
'Monitoring'
do
%span
Monitoring
=
nav_link
(
controller: :deploy_keys
)
do
=
link_to
admin_deploy_keys_path
,
title:
'Deploy Keys'
do
%span
Deploy Keys
=
nav_link
(
controller: :broadcast_messages
)
do
=
link_to
admin_broadcast_messages_path
,
title:
'Messages'
do
%span
Messages
=
nav_link
(
controller: :hooks
)
do
=
link_to
admin_hooks_path
,
title:
'Hooks'
do
%span
Hooks
=
nav_link
(
controller: :applications
)
do
%ul
.nav-links.scrolling-tabs
=
link_to
admin_applications_path
,
title:
'Applications'
do
.fade-left
%span
=
nav_link
(
controller:
%w(dashboard admin projects users groups builds runners)
,
html_options:
{
class:
'home'
})
do
Applications
=
link_to
admin_root_path
,
title:
'Overview'
,
class:
'shortcuts-tree'
do
%span
=
nav_link
(
controller: :services
)
do
Overview
=
link_to
admin_application_settings_services_path
,
title:
'Service Templates'
do
=
nav_link
(
controller:
%w(background_jobs logs health_check)
)
do
%span
=
link_to
admin_background_jobs_path
,
title:
'Monitoring'
do
Service Templates
%span
Monitoring
=
nav_link
(
controller: :labels
)
do
=
nav_link
(
controller: :broadcast_messages
)
do
=
link_to
admin_labels_path
,
title:
'Labels'
do
=
link_to
admin_broadcast_messages_path
,
title:
'Messages'
do
%span
%span
Labels
Messages
=
nav_link
(
controller: :hooks
)
do
=
link_to
admin_hooks_path
,
title:
'Hooks'
do
%span
System Hooks
=
nav_link
(
controller: :abuse_reports
)
do
=
nav_link
(
controller: :applications
)
do
=
link_to
admin_abuse_reports_path
,
title:
"Abuse Reports"
do
=
link_to
admin_applications_path
,
title:
'Applications'
do
%span
%span
Abuse Reports
Applications
%span
.badge.count
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
-
if
askimet_enabled?
=
nav_link
(
controller: :abuse_reports
)
do
=
nav_link
(
controller: :spam_logs
)
do
=
link_to
admin_abuse_reports_path
,
title:
"Abuse Reports"
do
=
link_to
admin_spam_logs_path
,
title:
"Spam Logs"
do
%span
%span
Spam Logs
Abuse Reports
%span
.badge.count
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
=
nav_link
(
controller:
[
:application_settings
,
:appearances
])
do
-
if
askimet_enabled?
=
link_to
admin_application_settings_path
,
title:
'Settings'
do
=
nav_link
(
controller: :spam_logs
)
do
%span
=
link_to
admin_spam_logs_path
,
title:
"Spam Logs"
do
Settings
%span
.fade-right
Spam Logs
.fade-right
app/views/layouts/nav/_admin_settings.html.haml
0 → 100644
View file @
3f12e8d1
.controls
.dropdown.admin-settings-dropdown
%a
.dropdown-new.btn.btn-default
{
href:
'#'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
'cog'
)
=
icon
(
'caret-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right
=
nav_link
(
controller: :deploy_keys
)
do
=
link_to
admin_deploy_keys_path
,
title:
'Deploy Keys'
do
%span
Deploy Keys
=
nav_link
(
controller: :services
)
do
=
link_to
admin_application_settings_services_path
,
title:
'Service Templates'
do
%span
Service Templates
=
nav_link
(
controller: :labels
)
do
=
link_to
admin_labels_path
,
title:
'Labels'
do
%span
Labels
=
nav_link
(
controller: :appearances
)
do
=
link_to
admin_appearances_path
,
title:
'Appearances'
do
%span
Appearance
%li
.divider
=
nav_link
(
controller: :application_settings
)
do
=
link_to
admin_application_settings_path
,
title:
'Settings'
do
%span
Settings
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