[freeside-commits] branch master updated. d68fea37d5d37d1e40fde18fbaca503c1ab3be87

[Ivan]

The branch, master has been updated
       via  d68fea37d5d37d1e40fde18fbaca503c1ab3be87 (commit)
      from  336f7a8681ea658e1f972e49766e2831eac94324 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d68fea37d5d37d1e40fde18fbaca503c1ab3be87
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 20 16:03:01 2012 -0700

    brand-agent removes documentation links too, RT#18213

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 06f7d59..14f8cd2 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -634,18 +634,18 @@ my $doc_link = $conf->config('support-key')
 eval "use RT;"
   if $conf->config('ticket_system') eq 'RT_Internal';
 
-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'} = '';
-
+tie my %help_menu, 'Tie::IxHash';
 my $agentnum = $conf->config('brand-agent');
 if ( $agentnum ) {
   my $company_name = $conf->config('company_name', $agentnum);
   $help_menu{"About $company_name"} = [ "javascript:about_freeside()", '' ];
 } else {
+  $help_menu{'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';

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/menu.html |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)