Merge branch 'master' of ssh://git.code.sf.net/p/netdisco/netdisco-ng

2013-10-10 10:42:23 -04:00
parent 5a9e0bce24 253bf769fb
commit a3835798b7
24 changed files with 363 additions and 144 deletions
--- a/Netdisco/share/config.yml
+++ b/Netdisco/share/config.yml
@@ -86,6 +86,8 @@ macsuck_min_age: 0
 arpnip_no: []
 arpnip_only: []
 arpnip_min_age: 0
+nodenames_no: []
+nodenames_only: []
 store_wireless_clients: true
 store_modules: true
 ignore_interfaces:
--- a/Netdisco/share/public/css/nd_print.css
+++ b/Netdisco/share/public/css/nd_print.css
@@ -14,3 +14,12 @@ body {
  margin-left: 0px !important;
  margin-right: 0px !important;
 }
+
+.floatThead-table {
+  position: inherit;
+  top: 45px;
+}
+
+a:after {
+  content: "" !important;
+}