From 6efdfc8300951c43fc46969fc5961efef7ed320a Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sat, 3 Mar 2012 20:46:52 +0000 Subject: [PATCH] new bs2 label naming --- Netdisco/public/css/netdisco.css | 11 +++-- Netdisco/views/ajax/device/ports.tt | 14 +++--- Netdisco/views/ajax/search/node_by_ip.tt | 6 +-- Netdisco/views/ajax/search/node_by_mac.tt | 4 +- Netdisco/views/index.tt | 2 +- Netdisco/views/sidebar/device/ports.tt | 56 ++++++++++++----------- Netdisco/views/sidebar/search/device.tt | 2 +- Netdisco/views/sidebar/search/node.tt | 5 +- 8 files changed, 55 insertions(+), 45 deletions(-) diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css index ee5da9df..7e3b370e 100644 --- a/Netdisco/public/css/netdisco.css +++ b/Netdisco/public/css/netdisco.css @@ -91,7 +91,7 @@ body { float: right; } -/* draw little up arrow to the right of a label for collapsed list */ +/* draw little up arrow to the left of a label for collapsed list */ .cell-arrow-up { float: left; margin-top: 5px; @@ -101,7 +101,7 @@ body { border-bottom: 8px solid #F89406; } -/* draw little down arrow to the right of a label for collapsed list */ +/* draw little down arrow to the left of a label for collapsed list */ .cell-arrow-down { float: left; margin-top: 5px; @@ -151,7 +151,7 @@ body { /* nudge the port name/vlan filter over a little */ .nd_port_query { - margin-left: -2px !important; + width: 141px; /* FIXME width and placing */ } /* little sweep brush inside of port filter input field */ @@ -255,4 +255,9 @@ form .clearfix.success input { padding-top: 4px !important; } +/* a little whitespace between legend items */ +.nd_legend > li { + line-height: 19px; +} + /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ diff --git a/Netdisco/views/ajax/device/ports.tt b/Netdisco/views/ajax/device/ports.tt index 924cfd4c..098f67c4 100644 --- a/Netdisco/views/ajax/device/ports.tt +++ b/Netdisco/views/ajax/device/ports.tt @@ -13,13 +13,13 @@ [% IF row.up_admin == 'down' %] - s + S [% ELSIF row.stp == 'blocking' %] - b + B [% ELSIF params.free OR row.is_free %] - f + F [% ELSIF row.up_admin == 'up' AND row.up == 'down' %] - d + D [% END %] [% IF params.c_port %] @@ -86,7 +86,7 @@ [% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip %] ([% row.remote_port | html_entity %]) [% ELSE %] - n + N [% row.remote_ip %] (port: [% row.remote_port %] id: [% (row.remote_type _ ' / ') IF row.remote_type %][% row.remote_id %]) @@ -94,12 +94,12 @@ [% END %] [% FOREACH node IN row.$nodes %] [% '
' IF row.remote_ip OR NOT loop.first %] - [% 'a  ' IF NOT node.active %] + [% 'A  ' IF NOT node.active %] [% node.mac %] [% ' (' _ node.time_last_age _ ')' IF params.n_age %] [% IF params.n_ip %] [% FOREACH ip IN node.ips %] -
  [% 'a  ' IF NOT ip.active %] +
  [% 'A  ' IF NOT ip.active %] [% SET dns = ip.dns %] [% IF dns %] [% dns %] ([% ip.ip %]) diff --git a/Netdisco/views/ajax/search/node_by_ip.tt b/Netdisco/views/ajax/search/node_by_ip.tt index 3093276d..d3f7d928 100644 --- a/Netdisco/views/ajax/search/node_by_ip.tt +++ b/Netdisco/views/ajax/search/node_by_ip.tt @@ -24,7 +24,7 @@ IP → MAC [% row.ip %] [% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %] - [% ' a' IF NOT row.active %] + [% ' A' IF NOT row.active %] [% IF params.stamps %] [% row.time_first_stamp %] @@ -40,7 +40,7 @@ Switch Port [% node.switch %] [ [% node.port %] ] [% ' (' _ node.device.dns.remove(settings.domain_suffix) _ ')' IF node.device.dns %] - [% ' a' IF NOT node.active %] + [% ' A' IF NOT node.active %] [% IF params.stamps %] [% node.time_first_stamp %] @@ -57,7 +57,7 @@ MAC → IP [% nodeip.ip %] [% ' (' _ nodeip.dns.remove(settings.domain_suffix) _ ')' IF nodeip.dns %] - [% ' a' IF NOT nodeip.active %] + [% ' A' IF NOT nodeip.active %] [% IF params.stamps %] [% nodeip.time_first_stamp %] diff --git a/Netdisco/views/ajax/search/node_by_mac.tt b/Netdisco/views/ajax/search/node_by_mac.tt index 16cbefc0..4adf1788 100644 --- a/Netdisco/views/ajax/search/node_by_mac.tt +++ b/Netdisco/views/ajax/search/node_by_mac.tt @@ -37,7 +37,7 @@ MAC → IP [% row.ip %] [% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %] - [% ' a' IF NOT row.active %] + [% ' A' IF NOT row.active %] [% IF params.stamps %] [% row.time_first_stamp %] @@ -68,7 +68,7 @@ Switch Port [% node.switch %] [ [% node.port %] ] [% ' (' _ node.device.dns.remove(settings.domain_suffix) _ ')' IF node.device.dns %] - [% ' a' IF NOT node.active %] + [% ' A' IF NOT node.active %] [% IF params.stamps %] [% node.time_first_stamp %] diff --git a/Netdisco/views/index.tt b/Netdisco/views/index.tt index 8323b6d2..7de9df2c 100644 --- a/Netdisco/views/index.tt +++ b/Netdisco/views/index.tt @@ -45,7 +45,7 @@
- +
[% IF vars.requested_path %] diff --git a/Netdisco/views/sidebar/device/ports.tt b/Netdisco/views/sidebar/device/ports.tt index 12ba6763..2781874e 100644 --- a/Netdisco/views/sidebar/device/ports.tt +++ b/Netdisco/views/sidebar/device/ports.tt @@ -5,45 +5,46 @@ -
-
-
-
    +
    +
      [% FOREACH item IN vars.port_columns %]
    • -
      • [% END %] @@ -52,17 +53,19 @@
    -
    -
      +
      +
      • -

      • - + - [% item.label %] +
        • [% END %]
    - + diff --git a/Netdisco/views/sidebar/search/device.tt b/Netdisco/views/sidebar/search/device.tt index 5d92e454..88ed2d08 100644 --- a/Netdisco/views/sidebar/search/device.tt +++ b/Netdisco/views/sidebar/search/device.tt @@ -61,4 +61,4 @@ Match All Options
    - + diff --git a/Netdisco/views/sidebar/search/node.tt b/Netdisco/views/sidebar/search/node.tt index 2247e934..e0efc631 100644 --- a/Netdisco/views/sidebar/search/node.tt +++ b/Netdisco/views/sidebar/search/node.tt @@ -22,7 +22,8 @@
[% IF vars.node_ip_has_dns_col %] @@ -35,4 +36,4 @@
[% END %] - +