From 0b1c458214a23b0ae3d8b8926989341e69468ff3 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 29 Dec 2010 04:32:46 +0000 Subject: [PATCH] torrus , RT#10574 --- FS/FS/Conf.pm | 21 +++++++++++++++------ httemplate/elements/menu.html | 10 ++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index ace7c3335..07d570588 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -465,7 +465,7 @@ sub _orbase_items { 'key' => $_, 'base_key' => $proto->key, 'section' => $proto->section, - 'description' => 'Alternate ' . $proto->description . ' See the billing documentation for details.', + 'description' => 'Alternate ' . $proto->description . ' See the billing documentation for details.', 'type' => $proto->type, }; } &$listmaker($base); @@ -971,14 +971,14 @@ my %payment_gateway_options = ( { 'key' => 'invoice_template', 'section' => 'invoicing', - 'description' => 'Text template file for invoices. Used if no invoice_html template is defined, and also seen by users using non-HTML capable mail clients. See the billing documentation for details.', + 'description' => 'Text template file for invoices. Used if no invoice_html template is defined, and also seen by users using non-HTML capable mail clients. See the billing documentation for details.', 'type' => 'textarea', }, { 'key' => 'invoice_html', 'section' => 'invoicing', - 'description' => 'Optional HTML template for invoices. See the billing documentation for details.', + 'description' => 'Optional HTML template for invoices. See the billing documentation for details.', 'type' => 'textarea', }, @@ -1017,7 +1017,7 @@ my %payment_gateway_options = ( { 'key' => 'invoice_latex', 'section' => 'invoicing', - 'description' => 'Optional LaTeX template for typeset PostScript invoices. See the billing documentation for details.', + 'description' => 'Optional LaTeX template for typeset PostScript invoices. See the billing documentation for details.', 'type' => 'textarea', }, @@ -1474,7 +1474,7 @@ and customer address. Include units.', { 'key' => 'signupurl', 'section' => 'UI', - 'description' => 'if you are using customer-to-customer referrals, and you enter the URL of your signup server CGI, the customer view screen will display a customized link to the signup server with the appropriate customer as referral', + 'description' => 'if you are using customer-to-customer referrals, and you enter the URL of your signup server CGI, the customer view screen will display a customized link to the signup server with the appropriate customer as referral', 'type' => 'text', }, @@ -2441,13 +2441,22 @@ and customer address. Include units.', { 'key' => 'ticket_system', 'section' => '', - 'description' => 'Ticketing system integration. RT_Internal uses the built-in RT ticketing system (see the integrated ticketing installation instructions). RT_External accesses an external RT installation in a separate database (local or remote).', + 'description' => 'Ticketing system integration. RT_Internal uses the built-in RT ticketing system (see the integrated ticketing installation instructions). RT_External accesses an external RT installation in a separate database (local or remote).', 'type' => 'select', #'select_enum' => [ '', qw(RT_Internal RT_Libs RT_External) ], 'select_enum' => [ '', qw(RT_Internal RT_External) ], }, { + 'key' => 'network_monitoring_system', + 'section' => '', + 'description' => 'Networking monitoring system (NMS) integration. Torrus_Internal uses the built-in Torrus ticketing system (see the integrated networking monitoring system installation instructions).', + 'type' => 'select', + #'select_enum' => [ '', qw(RT_Internal RT_Libs RT_External) ], + 'select_enum' => [ '', qw(Torrus_Internal) ], + }, + + { 'key' => 'ticket_system-default_queueid', 'section' => '', 'description' => 'Default queue used when creating new customer tickets.', diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index 69d793626..ec176c972 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -557,10 +557,14 @@ eval "use RT;" tie my %help_menu, 'Tie::IxHash', 'Billing documentation' => [ $doc_link, 'Freeside documentation' ]; $help_menu{'Ticketing documentation'} = [ 'http://wiki.bestpractical.com/', 'Request Tracker Wiki' ] if $conf->config('ticket_system') eq 'RT_Internal'; +$help_menu{'Networking monitoring documentation'} = [ 'http://torrus.org/userguide.pod.html', 'Torrus User Guide' ] + if $conf->config('network_monitoring_system') eq 'Torrus_Internal'; $help_menu{'separator'} = ''; $help_menu{"About Freeside v$FS::VERSION"} = [ "javascript:about_freeside()", '' ]; $help_menu{"About RT v$RT::VERSION"} = [ 'http://www.bestpractical.com/rt', 'Request Tracker Homepage' ] if $conf->config('ticket_system') eq 'RT_Internal'; +$help_menu{"About Torrus v1.0.9"} = [ 'http://www.torrus.org/', 'Torrus Homepage' ] #XXX manual version + if $conf->config('network_monitoring_system') eq 'Torrus_Internal'; tie my %menu, 'Tie::IxHash'; @@ -586,6 +590,12 @@ if ( $conf->config('ticket_system') ) { 'Ticketing start page', ], } + +if ( $conf->config('network_monitoring_system') eq 'Torrus_Internal' ) { + $menu{'Network Main'} = + [ $fsurl.'torrus/main', 'Network monitoring start page' ], +} + $menu{'New prospect'} = [ $fsurl.'edit/prospect_main.html', 'Add a new prospect' ] if $curuser->access_right('New prospect'); $menu{'New customer'} = [ $fsurl.'edit/cust_main.cgi', 'Add a new customer' ] -- 2.11.0