Merge branch 'master' into og-reset-cookie

This commit is contained in:
Oliver Gorwits
2013-09-20 21:04:56 +01:00
23 changed files with 271 additions and 72 deletions

View File

@@ -47,7 +47,12 @@
[% FOREACH tab IN settings._device_tabs %]
<li[% ' class="active"' IF params.tab == tab.tag %]><a id="[% tab.tag %]_link" href="#[% tab.tag %]_pane">[% tab.label %]</a></li>
[% END %]
<span id="nd_device-name">[% d.dns || d.name | html_entity %]</span>
<span id="nd_device-name">
[% d.dns || d.name | html_entity %]
<a id="nd_csv-download" href="#" download="netdisco.csv">&nbsp;
<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>
</ul>
<div class="tab-content">
[% FOREACH tab IN settings._device_tabs %]