Skip to content

Commit e1d2c11

Browse files
author
Seth Falcon
committed
Make active main nav tab styled in webui
Also tweaking user-nav to be above tabs
1 parent d4833ce commit e1d2c11

4 files changed

Lines changed: 26 additions & 27 deletions

File tree

‎chef-server-webui/app/helpers/application_helper.rb‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,11 @@ def display_run_list_item(item)
3636
end
3737
end
3838

39+
def nav_link_item(title, dest)
40+
name = title.gsub(/ /, "").downcase
41+
klass = controller_name == name ? 'class="active"' : ""
42+
link = link_to(title, url(dest))
43+
"<li #{klass}>#{link}</li>"
44+
end
3945
end
4046
end

‎chef-server-webui/app/views/layout/application.html.haml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
.clear
3636
#main-navigation
3737
%ul
38-
%li= link_to "Environments", url(:environments)
39-
%li= link_to "Search", url(:searches)
40-
%li= link_to "Status", url(:status)
41-
%li= link_to "Roles", url(:roles)
42-
%li= link_to "Nodes", url(:nodes)
43-
%li= link_to "Cookbooks", url(:cookbooks)
44-
%li= link_to "Databags", url(:databags)
45-
%li= link_to "Clients", url(:clients)
46-
%li= link_to "Users", url(:users)
38+
= nav_link_item("Environments", :environments)
39+
= nav_link_item("Search", :searches)
40+
= nav_link_item("Status", :status)
41+
= nav_link_item("Roles", :roles)
42+
= nav_link_item("Nodes", :nodes)
43+
= nav_link_item("Cookbooks", :cookbooks)
44+
= nav_link_item("Databags", :databags)
45+
= nav_link_item("Clients", :clients)
46+
= nav_link_item("Users", :users)
4747
.clear
4848
#wrapper
4949
#main

‎chef-server-webui/public/stylesheets/base.css‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ body {
9191

9292
#wrapper {
9393
padding-top: 20px;
94+
background: #F4F4F6;
9495
}
9596

9697
#main .block {
@@ -124,14 +125,15 @@ body {
124125

125126
#user-navigation ul li, #main-navigation ul li, .secondary-navigation ul li {
126127
float: left;
128+
padding-top: 0;
127129
}
128130

129131
#main-navigation ul li {
130132
margin-right: 5px;
131133
}
132134

133135
#user-navigation ul li {
134-
padding: 5px 10px;
136+
padding: 60px 10px;
135137
}
136138

137139
#main-navigation ul li a:link, #main-navigation ul li a:visited, #main-navigation ul li a:hover, #main-navigation ul li a:active,

‎chef-server-webui/public/stylesheets/themes/djime-cerulean/style.css‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ a:link, a:visited, a:hover, a:active, h1, h2, h3 { color: #007BA7; }
2323

2424
body {
2525
color: #222;
26-
background: #C2C8D1;
26+
background: #F4F4F6;
2727
font-family: "Helvetica Neue",Helvetica,Arial,"Bitstream Vera Sans",sans-serif;
2828
}
2929

@@ -50,12 +50,6 @@ hr {
5050

5151
/* @end */
5252

53-
#user-navigation {
54-
top: auto;
55-
bottom: 5px;
56-
right: 25px;
57-
}
58-
5953
#main .block .content {
6054
background: #F7F7F8;
6155
padding-top: 1px;
@@ -85,14 +79,14 @@ hr {
8579
background-color: #005573;
8680
}
8781

88-
#main-navigation ul li a:hover {
89-
background-color: #001C26;
82+
#main-navigation ul li a:hover {
83+
background-color: #102E41;
9084
}
9185

92-
#main-navigation ul li.active a {
93-
background-color: #C2C8D1;
94-
background: -webkit-gradient(linear, left top, left bottom, from(#C2C8D1), to(#C2C8D1), color-stop(0.5, #F7F7F8), color-stop(0.5, #F7F7F8));
95-
86+
#main-navigation ul li.active a, #main-navigation ul li.active a:visited {
87+
background: #F4F4F6;
88+
color: #102E41;
89+
font-weight: bold;
9690
}
9791

9892
/* @end */
@@ -140,16 +134,13 @@ hr {
140134

141135
/* @end */
142136

143-
#main-navigation ul li a:link, #main-navigation ul li a:visited, #main-navigation ul li a:hover, #main-navigation ul li a:active,
137+
#main-navigation ul li a:visited, #main-navigation ul li a:hover,
144138
.secondary-navigation ul li a:link, .secondary-navigation ul li a:visited, .secondary-navigation ul li a:hover, .secondary-navigation ul li a:active,
145139
#user-navigation ul li a:link, #user-navigation ul li a:visited, #user-navigation ul li a:hover, #user-navigation ul li a:active {
146140
text-decoration: none;
147141
color: #F7F7F8;
148142
}
149143

150-
#main-navigation ul li.active a:link, #main-navigation ul li.active a:visited, #main-navigation ul li.active a:hover, #main-navigation ul li.active a:active {
151-
color: #001C26;
152-
}
153144

154145
#footer .block {
155146
color: #F7F7F8;

0 commit comments

Comments
 (0)