Merge branch 'master' into em-device-ports-json

Netdisco/share/views/ajax/device/details.tt

@@ -80,6 +80,17 @@
         [% END %]
     </tr>
     [% END %]
+    <tr>
+      <td>Administration</td>
+      <td>
+        <a href="ssh://[% d.ip | html_entity %]" target="_blank">
+          <span class="label label-info"><i class="icon-keyboard"></i> SSH</span></a>
+        <a href="telnet://[% d.ip | html_entity %]" target="_blank">
+          <span class="label label-info"><i class="icon-keyboard"></i> Telnet</span></a>
+        <a href="https://[% d.ip | html_entity %]/" target="_blank">
+          <span class="label label-info"><i class="icon-external-link"></i> Web</span></a>
+      </td>
+    </tr>
     <tr>
       <td>Uptime</td>
       <td>[% d.uptime_age | html_entity %]</td>

Netdisco/share/views/ajax/report/devicebylocation.tt

@@ -48,7 +48,7 @@ $(document).ready(function() {
                     return '<a href="[% search_device %]&q=' + encodeURIComponent(data) + '&model=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>';
                 }
             }
-        ].
+        ],
 [% INCLUDE 'ajax/datatabledefaults.tt' -%]
     });
 

Netdisco/share/views/report.tt

@@ -17,6 +17,7 @@
             [% INCLUDE "sidebar/report/${report.tag}.tt" %]
             [% CATCH %]
             <script type="text/javascript">has_sidebar["[% report.tag %]"] = 0;</script>
+            [% INCLUDE "sidebar/report/generic_report.tt" %]
             [% END %]
           </form>
         </div> <!-- /tab-pane -->

Netdisco/share/views/sidebar/report/generic_report.tt

@@ -0,0 +1,4 @@
+
+[% FOREACH k IN report.rconfig.bind_params %]
+            <input name="[% k %]" value="[% params.$k | html_entity %]" type="hidden"/>
+[% END %]