duckduckgo
/
zeroclickinfo-goodies
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #504 from mattr555/subnet-italics 

SubnetCalc: gray labels, not bold them
master
Rob Emery 2014-07-02 20:26:19 +01:00
parent 85dca5499d d7631def4d
commit 2454ee5655
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/DDG/Goodie/SubnetCalc.pm
View File

@ -98,10 +98,12 @@ handle query => sub {
sub to_html {
my $results = "";
my $minwidth = "70px";
foreach my $result (@_) {
$results .= "<div><i>$result->[0]: </i>$result->[1]</div>";
$results .= "<div><span class=\"subnet__label text--secondary\">$result->[0]: </span><span class=\"text--primary\">$result->[1]</span></div>";
$minwidth = "140px" if $result->[0] eq "Host Address Range";
}
return $results;
return $results . "<style> .zci--answer .subnet__label {display: inline-block; min-width: $minwidth}</style>";
}
sub to_text {

24
t/SubnetCalc.t
View File

@ -15,25 +15,19 @@ ddg_goodie_test(
'DDG::Goodie::SubnetCalc'
],
"10.0.0.0/24" => test_zci(
"Network: 10.0.0.0/24 (Class A)\nNetmask: 255.255.255.0\nSpecified: Network\nHost Address Range: 10.0.0.1-10.0.0.254 (254 hosts)\nBroadcast: 10.0.0.255\n",
html => "<div><i>Network: </i>10.0.0.0/24 (Class A)</div><div><i>Netmask: </i>255.255.255.0</div><div><i>Specified: </i>Network</div><div><i>Host Address Range: </i>10.0.0.1-10.0.0.254 (254 hosts)</div><div><i>Broadcast: </i>10.0.0.255</div>",
),
"Network: 10.0.0.0/24 (Class A)\nNetmask: 255.255.255.0\nSpecified: Network\nHost Address Range: 10.0.0.1-10.0.0.254 (254 hosts)\nBroadcast: 10.0.0.255\n", html => qr/.*/),
"192.168.0.0/24" => test_zci(
"Network: 192.168.0.0/24 (Class C)\nNetmask: 255.255.255.0\nSpecified: Network\nHost Address Range: 192.168.0.1-192.168.0.254 (254 hosts)\nBroadcast: 192.168.0.255\n",
html => "<div><i>Network: </i>192.168.0.0/24 (Class C)</div><div><i>Netmask: </i>255.255.255.0</div><div><i>Specified: </i>Network</div><div><i>Host Address Range: </i>192.168.0.1-192.168.0.254 (254 hosts)</div><div><i>Broadcast: </i>192.168.0.255</div>",
),
"Network: 192.168.0.0/24 (Class C)\nNetmask: 255.255.255.0\nSpecified: Network\nHost Address Range: 192.168.0.1-192.168.0.254 (254 hosts)\nBroadcast: 192.168.0.255\n",html => qr/.*/),
"8.8.8.8 255.255.224.0" => test_zci(
"Network: 8.8.0.0/19 (Class A)\nNetmask: 255.255.224.0\nSpecified: Host #2056\nHost Address Range: 8.8.0.1-8.8.31.254 (8190 hosts)\nBroadcast: 8.8.31.255\n",
html => "<div><i>Network: </i>8.8.0.0/19 (Class A)</div><div><i>Netmask: </i>255.255.224.0</div><div><i>Specified: </i>Host #2056</div><div><i>Host Address Range: </i>8.8.0.1-8.8.31.254 (8190 hosts)</div><div><i>Broadcast: </i>8.8.31.255</div>",
),
"Network: 8.8.0.0/19 (Class A)\nNetmask: 255.255.224.0\nSpecified: Host #2056\nHost Address Range: 8.8.0.1-8.8.31.254 (8190 hosts)\nBroadcast: 8.8.31.255\n", html => qr/.*/),
'46.51.197.88/255.255.254.0' => test_zci(
"Network: 46.51.196.0/23 (Class A)\nNetmask: 255.255.254.0\nSpecified: Host #344\nHost Address Range: 46.51.196.1-46.51.197.254 (510 hosts)\nBroadcast: 46.51.197.255\n",
html => '<div><i>Network: </i>46.51.196.0/23 (Class A)</div><div><i>Netmask: </i>255.255.254.0</div><div><i>Specified: </i>Host #344</div><div><i>Host Address Range: </i>46.51.196.1-46.51.197.254 (510 hosts)</div><div><i>Broadcast: </i>46.51.197.255</div>',
),
"Network: 46.51.196.0/23 (Class A)\nNetmask: 255.255.254.0\nSpecified: Host #344\nHost Address Range: 46.51.196.1-46.51.197.254 (510 hosts)\nBroadcast: 46.51.197.255\n", html => qr/.*/),
'176.34.131.233/32' => test_zci(
"Network: 176.34.131.233/32 (Class B)\nNetmask: 255.255.255.255\nSpecified: Host Only\n",
html => '<div><i>Network: </i>176.34.131.233/32 (Class B)</div><div><i>Netmask: </i>255.255.255.255</div><div><i>Specified: </i>Host Only</div>'
),
"Network: 176.34.131.233/32 (Class B)\nNetmask: 255.255.255.255\nSpecified: Host Only\n", html => qr/.*/),
);
done_testing;