Merge branch 'master' into og-autoload

This commit is contained in:
Oliver Gorwits
2014-06-22 22:17:11 +01:00
2 changed files with 4 additions and 2 deletions

View File

@@ -4,8 +4,8 @@ use Dancer qw/:moose :syntax :script/;
use Dancer::Plugin::DBIC 'schema';
use Net::Domain 'hostfqdn';
use Module::Load ();
use Try::Tiny;
use MCE ();
use base 'Exporter';
our @EXPORT = ();
@@ -105,6 +105,7 @@ sub jq_userlog {
# MCE ->do() method.
sub jq_take {
my ($wid, $type) = @_;
Module::Load::load 'MCE';
# be polite to SQLite database (that is, local CPU)
debug "$type ($wid): sleeping now...";

View File

@@ -103,7 +103,8 @@
[% END %]
</td>
<td>Switch Port</td>
<td><a class="nd_linkcell nd_center-cell"
<td class="nd_center-cell">
<a class="nd_linkcell"
href="[% device_ports %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on">
[% node.switch | html_entity %] - [% node.port | html_entity %]
[% '&nbsp;<i class="icon-book text-warning"></i>' IF NOT node.active %]</a>