diff options
| author | levinse <levinse> | 2011-02-10 01:08:44 +0000 |
|---|---|---|
| committer | levinse <levinse> | 2011-02-10 01:08:44 +0000 |
| commit | 406b21cab11a2a89f359d40d10d6b37e60eddc1e (patch) | |
| tree | b096753908ac0039df37f8d4360c2d4ed4028536 | |
| parent | 64ccb0c8d26c387b323fb34e671b34c62d2c0c81 (diff) | |
torrus, UI, RT10574
| -rw-r--r-- | FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm | 2 | ||||
| -rw-r--r-- | torrus/perllib/Torrus/Renderer/HTML.pm | 3 | ||||
| -rw-r--r-- | torrus/templates/default-dir.html | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm b/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm index e48b6a6f8..e7d3db12f 100644 --- a/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm +++ b/FS/FS/NetworkMonitoringSystem/Torrus_Internal.pm @@ -97,7 +97,7 @@ sub find_svc { sub report { my $self = shift; - my @lt = localtime(time); + my @ls = localtime(time); my ($d,$m,$y) = ($ls[3], $ls[4]+1, $ls[5]+1900); if ( $ls[3] == 1 ) { $m--; diff --git a/torrus/perllib/Torrus/Renderer/HTML.pm b/torrus/perllib/Torrus/Renderer/HTML.pm index 657f66f00..bf6ba99b9 100644 --- a/torrus/perllib/Torrus/Renderer/HTML.pm +++ b/torrus/perllib/Torrus/Renderer/HTML.pm @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -# $Id: HTML.pm,v 1.7 2011-02-07 05:20:41 levinse Exp $ +# $Id: HTML.pm,v 1.8 2011-02-10 01:08:44 levinse Exp $ # Stanislav Sinyagin <ssinyagin@yahoo.com> package Torrus::Renderer::HTML; @@ -120,6 +120,7 @@ sub render_html 'freesideComponent' => sub { return $self->freesideComponent(@_); }, 'uri_escape' => sub { return uri_escape(@_); }, 'matches' => sub { return $_[0] =~ $_[1]; }, + 'slash2underscore' => sub { $_[0] =~ s/\//_/g; return $_[0]; }, 'load_nms' => sub { return $self->load_nms; }, 'get_serviceids' => sub { my $nms = shift; my $router = shift; diff --git a/torrus/templates/default-dir.html b/torrus/templates/default-dir.html index 7eec26744..bcdc001b4 100644 --- a/torrus/templates/default-dir.html +++ b/torrus/templates/default-dir.html @@ -17,7 +17,7 @@ serviceids = get_serviceids(nms,router); # HACK! this doesn't do what you think it does... - popup_link('nms-add_iface.html',router,uri_escape(nodeName(token)),nms,serviceids); + popup_link('nms-add_iface.html',router,uri_escape(slash2underscore(nodeName(token))),nms,serviceids); END; IF matches(thepath,'Routers/$'); freesideComponent('/elements/init_overlib.html'); @@ -63,7 +63,7 @@ thisIsAlias ? '</EM>':''; %] [% IF matches(thepath,'Interface_Counters/$') %] <FONT SIZE="-1"> - [% popup_link('nms-add_iface.html',router,uri_escape(nodeName(child)),nms,serviceids) %] + [% popup_link('nms-add_iface.html',router,uri_escape(slash2underscore(nodeName(child))),nms,serviceids) %] </FONT> [% END %] </SPAN> |