Merge branch 'master' into og-reset-cookie

2013-09-20 21:04:56 +01:00
parent 905a192426 ce604ca20b
commit 49399301b9
23 changed files with 271 additions and 72 deletions
--- a/Netdisco/share/views/report.tt
+++ b/Netdisco/share/views/report.tt
@@ -28,6 +28,13 @@
    <ul id="nd_search-results" class="nav nav-tabs">
      <li class="active"><a id="[% report.tag %]_link" class="nd_single-tab"
        href="#[% report.tag %]_pane">[% report.label %]</a></li>
+      [% IF report.provides_csv %]
+      <span id="nd_device-name">
+        <a id="nd_csv-download" href="#" download="netdisco.csv">
+          <i id="nd_csv-download-icon" class="text-info icon-file-text-alt icon-large"
+            rel="tooltip" data-placement="left" data-offset="5" data-title="Download as CSV"></i></a>
+      </span>
+      [% END %]
    </ul>
    <div class="tab-content">
      <div class="tab-pane active" id="[% report.tag %]_pane"></div>