From: levinse <levinse>
Date: Sat, 5 Feb 2011 06:32:36 +0000 (+0000)
Subject: torrus, add router UI, RT10574
X-Git-Tag: freeside_2_3_0~640
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=3a4bf42c4385863ea83423b279b39ff6e650f79d

torrus, add router UI, RT10574
---

diff --git a/httemplate/misc/nms-add_router.html b/httemplate/misc/nms-add_router.html
new file mode 100644
index 000000000..35ef7bf72
--- /dev/null
+++ b/httemplate/misc/nms-add_router.html
@@ -0,0 +1,17 @@
+<% header('Add Router') %>
+
+<FORM NAME="nms-add_iface" ACTION="<% popurl(1) %>process/nms-add_router.html" METHOD=POST>
+Router Hostname/IP 
+<% include('/elements/input-text.html',
+		    'field' => 'host',
+	  )
+%>
+<BR>
+<INPUT TYPE="submit" NAME="submit" ID="submit_nms-add_router" VALUE="Add Router">
+</FORM>
+
+<%init>
+
+# XXX: access rights, disable/enable submit button, something's wrong with style
+
+</%init>
diff --git a/httemplate/misc/process/nms-add_iface.html b/httemplate/misc/process/nms-add_iface.html
index ffc70d9cc..04d6095d0 100644
--- a/httemplate/misc/process/nms-add_iface.html
+++ b/httemplate/misc/process/nms-add_iface.html
@@ -13,9 +13,6 @@ die 'invalid iface' unless $iface =~ /^[0-9A-Za-z_\-.\\\/ ]+$/;
 my $serviceid = $cgi->param('serviceid');
 die 'invalid serviceid' unless $serviceid =~ /^[0-9A-Za-z_\-.\\\/ ]+$/;
   
-my $conf = new FS::Conf;
-my $system = $conf->config('network_monitoring_system');
-
 my $nms = new FS::NetworkMonitoringSystem;
 $nms->add_interface($host,$iface,$serviceid);
 
diff --git a/httemplate/misc/process/nms-add_router.html b/httemplate/misc/process/nms-add_router.html
new file mode 100644
index 000000000..bc437d2b3
--- /dev/null
+++ b/httemplate/misc/process/nms-add_router.html
@@ -0,0 +1,13 @@
+<% header('Router added') %>
+</BODY></HTML>
+<%init>
+
+# XXX: access rights
+
+my $host = $cgi->param('host'); 
+die 'invalid host' unless $host =~ /^[0-9.a-zA-Z\-]+$/;
+
+my $nms = new FS::NetworkMonitoringSystem;
+$nms->add_router($host);
+
+</%init>
diff --git a/torrus/perllib/Torrus/Renderer/HTML.pm b/torrus/perllib/Torrus/Renderer/HTML.pm
index d4a2a1380..4001baeed 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.5 2011-01-28 02:49:15 levinse Exp $
+# $Id: HTML.pm,v 1.6 2011-02-05 06:32:36 levinse Exp $
 # Stanislav Sinyagin <ssinyagin@yahoo.com>
 
 package Torrus::Renderer::HTML;
@@ -134,6 +134,15 @@ sub render_html
 						 'actionlabel' => 'Monitor interface',
 					    );
 				   }
+				   elsif($type eq 'nms-add_router.html') {
+					return
+					    $self->freesideComponent('/elements/popup_link.html',
+						'action' => "/freeside/misc/$type",
+						 'label' => 'Add Router',
+						 'actionlabel' => 'Add Router',
+					    );
+				   }
+
 				   '';
 				},
 
diff --git a/torrus/templates/default-dir.html b/torrus/templates/default-dir.html
index 91e6e4425..db1821260 100644
--- a/torrus/templates/default-dir.html
+++ b/torrus/templates/default-dir.html
@@ -7,6 +7,10 @@
 [% IF matches(thepath,'Interface_Counters/$') %]
    [% freesideComponent('/elements/init_overlib.html') %]
 [% END %]
+[% IF matches(thepath,'Routers/$') %]
+   [% freesideComponent('/elements/init_overlib.html') %]
+   [% popup_link('nms-add_router.html') %]
+[% END %]
 
 <P>Directories you can jump to:</P>
 <DIV CLASS="Listing">