From 6cebc2154e81a0c60a8892fdac88fca5be74f75b Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Wed, 4 Apr 2012 16:48:01 -0700 Subject: [PATCH] add brand-agent option, RT#17055 --- FS/FS/Conf.pm | 17 +++++++++++++- httemplate/docs/about.html | 50 ++++++++++++++++++++++++++++++++++++------ httemplate/docs/credits.html | 7 ++++-- httemplate/elements/menu.html | 19 +++++++++++----- httemplate/view/logo-agent.cgi | 10 +++++++++ 5 files changed, 87 insertions(+), 16 deletions(-) create mode 100755 httemplate/view/logo-agent.cgi diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 111bafa43..b0f85cf06 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -2857,6 +2857,14 @@ and customer address. Include units.', }, { + 'key' => 'company_url', + 'section' => 'UI', + 'description' => 'Your company URL', + 'type' => 'text', + 'per_agent' => 1, + }, + + { 'key' => 'company_address', 'section' => 'required', 'description' => 'Your company address', @@ -4860,7 +4868,14 @@ and customer address. Include units.', }, }, - + { + 'key' => 'brand-agent', + 'section' => 'UI', + 'description' => 'Brand the backoffice interface (currently Help->About) using the company_name, company_url and logo.png configuration settings of the selected agent. Typically used when selling or bundling hosted access to the backoffice interface. NOTE: The AGPL software license has specific requirements for source code availability in this situation.', + 'type' => 'select-agent', + }, + + { key => "apacheroot", section => "deprecated", description => "DEPRECATED", type => "text" }, { key => "apachemachine", section => "deprecated", description => "DEPRECATED", type => "text" }, { key => "apachemachines", section => "deprecated", description => "DEPRECATED", type => "text" }, diff --git a/httemplate/docs/about.html b/httemplate/docs/about.html index 76a477c05..e3bb28298 100644 --- a/httemplate/docs/about.html +++ b/httemplate/docs/about.html @@ -1,14 +1,34 @@ -<% include('/elements/header-popup.html', { title=>'Freeside', nobr=>1 } ) %> +<% include('/elements/header-popup.html', { title=>$title, nobr=>1 } ) %> <% include('/elements/init_overlib.html') %>
-
-

version <% $FS::VERSION %>

+% if ( $agentnum ) { + +
+ +% my $url = $conf->config('company_url', $agentnum); +% if ( $url ) { +

+ <%$title%> homepage +% } + +% } else { + +
+

version <% $FS::VERSION %>

+ +% }
-© 2012 Freeside Internet Services, Inc.
+% if ( $agentnum ) { +

+ Based on Freeside version <% $FS::VERSION %>
+% } else { + +% } +© 2012 Freeside Internet Services, Inc.
All rights reserved.
Licensed under the terms of the
GNU Affero General Public License.
@@ -17,6 +37,9 @@ GNU Affero General Public License.

+% if ( $agentnum ) { + +% } Credits      License @@ -24,13 +47,18 @@ GNU Affero General Public License.


Freeside homepage +% if ( $agentnum ) { +
+% }

-
-"A selfish heart is trouble, but a foolish heart is worse" -R. Hunter -
+% unless ( $agentnum ) { +
+ "A selfish heart is trouble, but a foolish heart is worse" -R. Hunter +
+% }