135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

suppress favicon and move errant style from HEAD to css doc

Browse Source
This commit is contained in:
Oliver Gorwits
2012-01-07 19:49:49 +00:00
parent e7860b2aea
commit 54d6422894
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Netdisco/lib/Netdisco/Web.pm
View File

@@ -24,10 +24,10 @@ ajax '/ajax/content/search/:thing' => sub {
# devices carrying vlan xxx # devices carrying vlan xxx
ajax '/ajax/content/search/vlan' => sub { ajax '/ajax/content/search/vlan' => sub {
my $q = param('q'); my $vlan = param('q');
return unless $q and $q =~ m/^\d+$/; 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; return unless $set->count;
content_type('text/html'); content_type('text/html');
@@ -42,7 +42,7 @@ ajax '/ajax/content/search/vlan' => sub {
], ],
hyperlink => sub { hyperlink => sub {
my $row = shift; my $row = shift;
return '/device?q=' . $row->ip; return '/device?q='. $row->ip .'&vlan='. $vlan;
}, },
}, { layout => undef }; }, { layout => undef };
}; };

5
Netdisco/public/css/style.css
View File

@@ -1,3 +1,8 @@
/* for the fixed navbar */
body {
padding-top: 50px;
}
.nd_loginalert { .nd_loginalert {
margin-top: -40px; margin-top: -40px;
} }

13
Netdisco/views/layouts/main.tt
View File

@@ -2,8 +2,9 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=[% settings.charset %]" /> <meta http-equiv="Content-type" content="text/html; charset=[% settings.charset %]" />
<title>Netdisco</title> <link rel="shortcut icon" href="#" />
<title>Netdisco</title>
<!-- HTML5 shim, for IE6-8 support of HTML elements --> <!-- HTML5 shim, for IE6-8 support of HTML elements -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
@@ -24,14 +25,6 @@
<link rel="stylesheet" href="/css/bootstrap.min.css"> <link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/style.css"> <link rel="stylesheet" href="/css/style.css">
<!-- for the fixed navbar -->
<style type="text/css">
body {
padding-top: 50px;
}
</style>
</head> </head>
<body> <body>