135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure navbar is always set on device_search link

Browse Source
This commit is contained in:
Oliver Gorwits
2013-09-22 14:13:29 +01:00
parent 21b5f3c20c
commit 0481d4f731
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/share/views/ajax/device/addresses.tt
View File

@@ -17,7 +17,7 @@
href="[% device_ports %]&q=[% params.q | uri %]&f=[% row.port | uri %]">[% row.port | html_entity %]</a></td> href="[% device_ports %]&q=[% params.q | uri %]&f=[% row.port | uri %]">[% row.port | html_entity %]</a></td>
<td>[% row.device_port.name | html_entity %]</td> <td>[% row.device_port.name | html_entity %]</td>
<td><a class="nd_linkcell" <td><a class="nd_linkcell"
href="[% search_device %]&ip=[% row.subnet | uri %]">[% row.subnet | html_entity %]</a></td> href="[% search_device %]&q=[% row.subnet | uri %]&ip=[% row.subnet | uri %]">[% row.subnet | html_entity %]</a></td>
</tr> </tr>
[% END %] [% END %]
</tbody> </tbody>

8
Netdisco/share/views/ajax/device/details.tt
View File

@@ -19,7 +19,7 @@
[% ELSE %] [% ELSE %]
<td> <td>
<a rel="tooltip" data-placement="top" data-offset="5" data-title="Find Similar Devices" <a rel="tooltip" data-placement="top" data-offset="5" data-title="Find Similar Devices"
href="[% search_device %]&location=[% d.location | uri %]">[% d.location | html_entity %]</a> href="[% search_device %]&q=[% d.location | uri %]&location=[% d.location | uri %]">[% d.location | html_entity %]</a>
</td> </td>
[% END %] [% END %]
</tr> </tr>
@@ -42,10 +42,10 @@
<td>Vendor / Model</td> <td>Vendor / Model</td>
<td> <td>
<a rel="tooltip" data-placement="top" data-offset="5" data-title="Find Similar Devices" <a rel="tooltip" data-placement="top" data-offset="5" data-title="Find Similar Devices"
href="[% search_device %]&vendor=[% d.vendor | uri %]">[% d.vendor | html_entity %]</a> href="[% search_device %]&q=[% d.vendor | uri %]&vendor=[% d.vendor | uri %]">[% d.vendor | html_entity %]</a>
/ /
<a rel="tooltip" data-placement="top" data-offset="5" data-title="Find Similar Devices" <a rel="tooltip" data-placement="top" data-offset="5" data-title="Find Similar Devices"
href="[% search_device %]&model=[% d.model | uri %]">[% d.model | html_entity %]</a> href="[% search_device %]&q=[% d.model | uri %]&model=[% d.model | uri %]">[% d.model | html_entity %]</a>
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -53,7 +53,7 @@
<td>[% d.os | html_entity %] / <td>[% d.os | html_entity %] /
<a rel="tooltip" data-placement="top" data-offset="5" <a rel="tooltip" data-placement="top" data-offset="5"
data-title="Find Similar Devices" data-title="Find Similar Devices"
href="[% search_device %]&os_ver=[% d.os_ver | uri %]">[% d.os_ver | html_entity %]</a> href="[% search_device %]&q=[% d.os_ver | uri %]&os_ver=[% d.os_ver | uri %]">[% d.os_ver | html_entity %]</a>
</td> </td>
</tr> </tr>
<tr> <tr>

6
Netdisco/share/views/inventory.tt
View File

@@ -17,12 +17,12 @@
<tr> <tr>
<th> <th>
<a class="nd_linkcell" <a class="nd_linkcell"
href="[% search_device %]&vendor=[% platform.vendor | uri %]"> href="[% search_device %]&q=[% platform.vendor | uri %]&vendor=[% platform.vendor | uri %]">
[% platform.vendor | html_entity %]</a> [% platform.vendor | html_entity %]</a>
</th> </th>
<th> <th>
<a class="nd_linkcell" <a class="nd_linkcell"
href="[% search_device %]&model=[% platform.model | uri %]"> href="[% search_device %]&q=[% platform.model | uri %]&model=[% platform.model | uri %]">
[% platform.model | html_entity %]</a> [% platform.model | html_entity %]</a>
</th> </th>
<th>[% platform.get_column('count') | html_entity %]</th> <th>[% platform.get_column('count') | html_entity %]</th>
@@ -48,7 +48,7 @@
<th>[% release.os | html_entity %]</th> <th>[% release.os | html_entity %]</th>
<th> <th>
<a class="nd_linkcell" <a class="nd_linkcell"
href="[% search_device %]&os_ver=[% release.os_ver | uri %]"> href="[% search_device %]&q=[% release.os_ver | uri %]&os_ver=[% release.os_ver | uri %]">
[% release.os_ver | html_entity %]</a> [% release.os_ver | html_entity %]</a>
</th> </th>
<th>[% release.get_column('count') | html_entity %]</th> <th>[% release.get_column('count') | html_entity %]</th>