diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css index 0bfe1db0..37eb9720 100644 --- a/Netdisco/public/css/netdisco.css +++ b/Netdisco/public/css/netdisco.css @@ -117,18 +117,6 @@ body { margin-bottom: 10px; } -/* right hand side device label */ -.device_label_right { - float: right !important; - margin-bottom: -7px !important; - display: none; -} - -/* take a block element and force it inline */ -.inline { - display: inline !important; -} - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* style customization for many items which appear in the sidebar */ @@ -179,20 +167,6 @@ form .clearfix.success input { background-color: #A9DBA9; } -/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -/* device and ip label in sidebar */ - -/* pull the device label closer to the top of the sidebar -to reduce the useless gap */ -h3.device_label { - margin-top: -12px; -} - -/* colour for device name and ip in sidebar */ -.device_label { - color: #660033; -} - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* sidebar collapser */ diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js index e7025392..9e335209 100644 --- a/Netdisco/public/javascripts/netdisco.js +++ b/Netdisco/public/javascripts/netdisco.js @@ -138,7 +138,6 @@ $(document).ready(function() { function() { $('#sidebar_toggle_img_out').toggle(); $('.content').animate({'margin-right': '10px !important'}, 50); - $('.device_label_right').toggle(); } ); sidebar_hidden = 1; @@ -149,7 +148,6 @@ $(document).ready(function() { $('#sidebar_toggle_img_out').toggle(); $('.content').animate({'margin-right': '220px !important'}, 100, function() { - $('.device_label_right').toggle(); $('.sidebar').toggle(200); $(window).scrollTop(0); } diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt index fa91beb9..8dd5f277 100644 --- a/Netdisco/views/device.tt +++ b/Netdisco/views/device.tt @@ -33,12 +33,6 @@ [% FOREACH tab IN vars.tabs %] [% tab.label %] [% END %] -
  • -

    [% d.ip %]

    - [% IF d.dns %] -
    ([% d.dns.remove(settings.domain_suffix) %])
    - [% END %] -
  • [% FOREACH tab IN vars.tabs %]