diff --git a/Netdisco/lib/Netdisco/Web.pm b/Netdisco/lib/Netdisco/Web.pm
index 0a9d1f83..a1501993 100644
--- a/Netdisco/lib/Netdisco/Web.pm
+++ b/Netdisco/lib/Netdisco/Web.pm
@@ -24,10 +24,10 @@ ajax '/ajax/content/search/:thing' => sub {
# devices carrying vlan xxx
ajax '/ajax/content/search/vlan' => sub {
- my $q = param('q');
- return unless $q and $q =~ m/^\d+$/;
+ my $vlan = param('q');
+ return unless $vlan and $vlan =~ m/^\d+$/;
- my $set = schema('netdisco')->resultset('Device')->carrying_vlan($q);
+ my $set = schema('netdisco')->resultset('Device')->carrying_vlan($vlan);
return unless $set->count;
content_type('text/html');
@@ -42,7 +42,7 @@ ajax '/ajax/content/search/vlan' => sub {
],
hyperlink => sub {
my $row = shift;
- return '/device?q=' . $row->ip;
+ return '/device?q='. $row->ip .'&vlan='. $vlan;
},
}, { layout => undef };
};
diff --git a/Netdisco/public/css/style.css b/Netdisco/public/css/style.css
index e974e106..eeac062c 100644
--- a/Netdisco/public/css/style.css
+++ b/Netdisco/public/css/style.css
@@ -1,3 +1,8 @@
+/* for the fixed navbar */
+body {
+ padding-top: 50px;
+}
+
.nd_loginalert {
margin-top: -40px;
}
diff --git a/Netdisco/views/layouts/main.tt b/Netdisco/views/layouts/main.tt
index c4c7b558..8ae718dc 100644
--- a/Netdisco/views/layouts/main.tt
+++ b/Netdisco/views/layouts/main.tt
@@ -2,8 +2,9 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-Netdisco
+
+
+ Netdisco
-
-