diff options
| author | ivan <ivan> | 2011-03-01 00:09:39 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-03-01 00:09:39 +0000 |
| commit | 39bf086cae20fa746336953f46ae7b9245f3891f (patch) | |
| tree | c0ba15528f4c61f1c8fa38ec4dc310b5cc74450c /torrus | |
| parent | 0589594f050aa8da5085113665362aa03afe0bfd (diff) | |
recognize interfaces with . turned into _ too
Diffstat (limited to 'torrus')
| -rw-r--r-- | torrus/perllib/Torrus/Renderer/HTML.pm | 4 | ||||
| -rw-r--r-- | torrus/templates/default-dir.html | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/torrus/perllib/Torrus/Renderer/HTML.pm b/torrus/perllib/Torrus/Renderer/HTML.pm index df0c65b..6eec86d 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.13 2011-02-27 19:20:37 ivan Exp $ +# $Id: HTML.pm,v 1.14 2011-03-01 00:09:39 ivan Exp $ # Stanislav Sinyagin <ssinyagin@yahoo.com> package Torrus::Renderer::HTML; @@ -120,7 +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]; }, + 'iface_underscore' => 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 bcdc001..c87b561 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(slash2underscore(nodeName(token))),nms,serviceids); + popup_link('nms-add_iface.html',router,uri_escape(iface_underscore(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(slash2underscore(nodeName(child))),nms,serviceids) %] + [% popup_link('nms-add_iface.html',router,uri_escape(iface_underscore(nodeName(child))),nms,serviceids) %] </FONT> [% END %] </SPAN> |