From 1021329e1c1dcfb21e5e5bc58b2545e215c07fc1 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 20 Sep 2013 18:57:20 +0100 Subject: [PATCH] display download as csv icon conditionally --- Netdisco/share/public/css/netdisco.css | 5 +++++ Netdisco/share/views/admintask.tt | 6 ++++++ Netdisco/share/views/device.tt | 7 ++++++- Netdisco/share/views/report.tt | 7 +++++-- Netdisco/share/views/search.tt | 5 +++++ 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Netdisco/share/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css index 84d8da40..8e616940 100644 --- a/Netdisco/share/public/css/netdisco.css +++ b/Netdisco/share/public/css/netdisco.css @@ -200,6 +200,11 @@ td > form.nd_inline-form { color: #6D5720; } +/* reset to normal weight for the download as CSV icon */ +#nd_csv-download { + font-weight: normal; +} + /* for the job control admin page play/pause links */ #nd_countdown-refresh:hover, #nd_countdown-control:hover { text-decoration: none; diff --git a/Netdisco/share/views/admintask.tt b/Netdisco/share/views/admintask.tt index 2baad94e..f3433d0c 100644 --- a/Netdisco/share/views/admintask.tt +++ b/Netdisco/share/views/admintask.tt @@ -36,6 +36,12 @@ + [% ELSIF task.provides_csv %] + + + + [% END %]
diff --git a/Netdisco/share/views/device.tt b/Netdisco/share/views/device.tt index bfa27799..067a9978 100644 --- a/Netdisco/share/views/device.tt +++ b/Netdisco/share/views/device.tt @@ -45,7 +45,12 @@ [% FOREACH tab IN settings._device_tabs %] [% tab.label %] [% END %] - [% d.dns || d.name | html_entity %] + + [% d.dns || d.name | html_entity %]   + + +
[% FOREACH tab IN settings._device_tabs %] diff --git a/Netdisco/share/views/report.tt b/Netdisco/share/views/report.tt index 6db3dce0..a73284b5 100644 --- a/Netdisco/share/views/report.tt +++ b/Netdisco/share/views/report.tt @@ -28,10 +28,13 @@
diff --git a/Netdisco/share/views/search.tt b/Netdisco/share/views/search.tt index 59d1f584..12bc89f9 100644 --- a/Netdisco/share/views/search.tt +++ b/Netdisco/share/views/search.tt @@ -32,6 +32,11 @@ [% FOREACH tab IN settings._search_tabs %] [% tab.label %] [% END %] + + + +
[% FOREACH tab IN settings._search_tabs %]