Merge branch 'admin-nav' into 'master'
Sidebar updates ## What does this MR do? Updates `nav/_admin.html.haml` and `nav/_explore.html.haml` to match new compact sidebar design ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_2.19.18_PM](/uploads/5699987001de901a67d503b097d1b19d/Screen_Shot_2016-06-07_at_2.19.18_PM.png) See merge request !4517
This commit is contained in:
commit
e6daf1f899
2 changed files with 23 additions and 27 deletions
|
@ -2,106 +2,102 @@
|
||||||
= nav_link(controller: :dashboard, html_options: {class: 'home'}) do
|
= nav_link(controller: :dashboard, html_options: {class: 'home'}) do
|
||||||
= link_to admin_root_path, title: 'Overview' do
|
= link_to admin_root_path, title: 'Overview' do
|
||||||
= icon('dashboard fw')
|
= icon('dashboard fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Overview
|
Overview
|
||||||
= nav_link(controller: [:admin, :projects]) do
|
= nav_link(controller: [:admin, :projects]) do
|
||||||
= link_to admin_namespaces_projects_path, title: 'Projects' do
|
= link_to admin_namespaces_projects_path, title: 'Projects' do
|
||||||
= icon('cube fw')
|
= icon('cube fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Projects
|
Projects
|
||||||
= nav_link(controller: :users) do
|
= nav_link(controller: :users) do
|
||||||
= link_to admin_users_path, title: 'Users' do
|
= link_to admin_users_path, title: 'Users' do
|
||||||
= icon('user fw')
|
= icon('user fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Users
|
Users
|
||||||
= nav_link(controller: :groups) do
|
= nav_link(controller: :groups) do
|
||||||
= link_to admin_groups_path, title: 'Groups' do
|
= link_to admin_groups_path, title: 'Groups' do
|
||||||
= icon('group fw')
|
= icon('group fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Groups
|
Groups
|
||||||
= nav_link(controller: :deploy_keys) do
|
= nav_link(controller: :deploy_keys) do
|
||||||
= link_to admin_deploy_keys_path, title: 'Deploy Keys' do
|
= link_to admin_deploy_keys_path, title: 'Deploy Keys' do
|
||||||
= icon('key fw')
|
= icon('key fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Deploy Keys
|
Deploy Keys
|
||||||
= nav_link path: ['runners#index', 'runners#show'] do
|
= nav_link path: ['runners#index', 'runners#show'] do
|
||||||
= link_to admin_runners_path, title: 'Runners' do
|
= link_to admin_runners_path, title: 'Runners' do
|
||||||
= icon('cog fw')
|
= icon('cog fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Runners
|
Runners
|
||||||
%span.count= number_with_delimiter(Ci::Runner.count(:all))
|
|
||||||
= nav_link path: 'builds#index' do
|
= nav_link path: 'builds#index' do
|
||||||
= link_to admin_builds_path, title: 'Builds' do
|
= link_to admin_builds_path, title: 'Builds' do
|
||||||
= icon('link fw')
|
= icon('link fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Builds
|
Builds
|
||||||
%span.count= number_with_delimiter(Ci::Build.count(:all))
|
|
||||||
= nav_link(controller: :logs) do
|
= nav_link(controller: :logs) do
|
||||||
= link_to admin_logs_path, title: 'Logs' do
|
= link_to admin_logs_path, title: 'Logs' do
|
||||||
= icon('file-text fw')
|
= icon('file-text fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Logs
|
Logs
|
||||||
= nav_link(controller: :health_check) do
|
= nav_link(controller: :health_check) do
|
||||||
= link_to admin_health_check_path, title: 'Health Check' do
|
= link_to admin_health_check_path, title: 'Health Check' do
|
||||||
= icon('medkit fw')
|
= icon('medkit fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Health Check
|
Health Check
|
||||||
= nav_link(controller: :broadcast_messages) do
|
= nav_link(controller: :broadcast_messages) do
|
||||||
= link_to admin_broadcast_messages_path, title: 'Messages' do
|
= link_to admin_broadcast_messages_path, title: 'Messages' do
|
||||||
= icon('bullhorn fw')
|
= icon('bullhorn fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Messages
|
Messages
|
||||||
= nav_link(controller: :hooks) do
|
= nav_link(controller: :hooks) do
|
||||||
= link_to admin_hooks_path, title: 'Hooks' do
|
= link_to admin_hooks_path, title: 'Hooks' do
|
||||||
= icon('external-link fw')
|
= icon('external-link fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Hooks
|
Hooks
|
||||||
= nav_link(controller: :background_jobs) do
|
= nav_link(controller: :background_jobs) do
|
||||||
= link_to admin_background_jobs_path, title: 'Background Jobs' do
|
= link_to admin_background_jobs_path, title: 'Background Jobs' do
|
||||||
= icon('cog fw')
|
= icon('cog fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Background Jobs
|
Background Jobs
|
||||||
= nav_link(controller: :appearances) do
|
= nav_link(controller: :appearances) do
|
||||||
= link_to admin_appearances_path, title: 'Appearances' do
|
= link_to admin_appearances_path, title: 'Appearances' do
|
||||||
= icon('image')
|
= icon('image')
|
||||||
%span
|
.nav-link-text
|
||||||
Appearance
|
Appearance
|
||||||
|
|
||||||
= nav_link(controller: :applications) do
|
= nav_link(controller: :applications) do
|
||||||
= link_to admin_applications_path, title: 'Applications' do
|
= link_to admin_applications_path, title: 'Applications' do
|
||||||
= icon('cloud fw')
|
= icon('cloud fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Applications
|
Applications
|
||||||
|
|
||||||
= nav_link(controller: :services) do
|
= nav_link(controller: :services) do
|
||||||
= link_to admin_application_settings_services_path, title: 'Service Templates' do
|
= link_to admin_application_settings_services_path, title: 'Service Templates' do
|
||||||
= icon('copy fw')
|
= icon('copy fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Service Templates
|
Service Templates
|
||||||
|
|
||||||
= nav_link(controller: :labels) do
|
= nav_link(controller: :labels) do
|
||||||
= link_to admin_labels_path, title: 'Labels' do
|
= link_to admin_labels_path, title: 'Labels' do
|
||||||
= icon('tags fw')
|
= icon('tags fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Labels
|
Labels
|
||||||
|
|
||||||
= nav_link(controller: :abuse_reports) do
|
= nav_link(controller: :abuse_reports) do
|
||||||
= link_to admin_abuse_reports_path, title: "Abuse Reports" do
|
= link_to admin_abuse_reports_path, title: "Abuse Reports" do
|
||||||
= icon('exclamation-circle fw')
|
= icon('exclamation-circle fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Abuse Reports
|
Abuse Reports
|
||||||
%span.count= number_with_delimiter(AbuseReport.count(:all))
|
|
||||||
|
|
||||||
- if askimet_enabled?
|
- if askimet_enabled?
|
||||||
= nav_link(controller: :spam_logs) do
|
= nav_link(controller: :spam_logs) do
|
||||||
= link_to admin_spam_logs_path, title: "Spam Logs" do
|
= link_to admin_spam_logs_path, title: "Spam Logs" do
|
||||||
= icon('exclamation-triangle fw')
|
= icon('exclamation-triangle fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Spam Logs
|
Spam Logs
|
||||||
%span.count= number_with_delimiter(SpamLog.count(:all))
|
|
||||||
|
|
||||||
= nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
|
= nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
|
||||||
= link_to admin_application_settings_path, title: 'Settings' do
|
= link_to admin_application_settings_path, title: 'Settings' do
|
||||||
= icon('cogs fw')
|
= icon('cogs fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Settings
|
Settings
|
||||||
|
|
|
@ -2,20 +2,20 @@
|
||||||
= nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
|
= nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
|
||||||
= link_to explore_root_path, title: 'Projects' do
|
= link_to explore_root_path, title: 'Projects' do
|
||||||
= icon('bookmark fw')
|
= icon('bookmark fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Projects
|
Projects
|
||||||
= nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
|
= nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
|
||||||
= link_to explore_groups_path, title: 'Groups' do
|
= link_to explore_groups_path, title: 'Groups' do
|
||||||
= icon('group fw')
|
= icon('group fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Groups
|
Groups
|
||||||
= nav_link(controller: :snippets) do
|
= nav_link(controller: :snippets) do
|
||||||
= link_to explore_snippets_path, title: 'Snippets' do
|
= link_to explore_snippets_path, title: 'Snippets' do
|
||||||
= icon('clipboard fw')
|
= icon('clipboard fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Snippets
|
Snippets
|
||||||
= nav_link(controller: :help) do
|
= nav_link(controller: :help) do
|
||||||
= link_to help_path, title: 'Help' do
|
= link_to help_path, title: 'Help' do
|
||||||
= icon('question-circle fw')
|
= icon('question-circle fw')
|
||||||
%span
|
.nav-link-text
|
||||||
Help
|
Help
|
||||||
|
|
Loading…
Reference in a new issue