[freeside-commits] branch FREESIDE_3_BRANCH updated. de8bd04f535315150385cffff65bc72c896792e6

Wed Aug 6 17:43:10 PDT 2014

The branch, FREESIDE_3_BRANCH has been updated
       via  de8bd04f535315150385cffff65bc72c896792e6 (commit)
      from  921fcc8e5e3f1ab55f81c01f2e70c170e223cdce (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 de8bd04f535315150385cffff65bc72c896792e6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 6 17:43:09 2014 -0700

    link header logo to company_url config, RT#28457

diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index d73e14c..1f2b6c8 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -58,7 +58,7 @@ Example:
   <BODY BGCOLOR="#f8f8f8" <% $etc |n %> STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px">
     <table width="100%" CELLPADDING=0 CELLSPACING=0 STYLE="padding-left:0px; padding-right:4px" CLASS="fshead">
       <tr>
-        <td BGCOLOR="#ffffff"><IMG BORDER=0 ALT="freeside" HEIGHT="36" SRC="<%$fsurl%>view/REAL_logo.cgi"></td>
+        <td BGCOLOR="#ffffff"><% $company_url ? qq(<A HREF="$company_url">) : '' %><IMG BORDER=0 ALT="freeside" HEIGHT="36" SRC="<%$fsurl%>view/REAL_logo.cgi"><% $company_url ? '</A>' : '' %></td>
         <td align=left BGCOLOR="#ffffff"> <!-- valign="top" -->
           <font size=6><% $company_name || 'ExampleCo' %></font>
         </td>
@@ -213,11 +213,13 @@ if ( $cgi->param('mobile') =~ /^(\d)$/ ) { # allow client to override
   $mobile = $1;
 }
 
-my $company_name;
+my($company_name, $company_url);
 my @agentnums = $curuser->agentnums;
 if ( scalar(@agentnums) == 1 ) {
   $company_name = $conf->config('company_name', $agentnums[0] );
+  $company_url  = $conf->config('company_url',  $agentnums[0] );
 } else {
   $company_name = $conf->config('company_name');
+  $company_url  = $conf->config('company_url');
 }
 </%init>

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

Summary of changes:
 httemplate/elements/header.html |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


