freeside/rt/html/Elements Header,1.5,1.6 Menu,1.1.1.3,1.2 Tabs,1.4,1.5

[Kristian Hoffmann]

Update of /home/cvs/cvsroot/freeside/rt/html/Elements
In directory pouncequick:/tmp/cvs-serv2432/rt/html/Elements

Modified Files:
	Header Menu Tabs 
Log Message:
Reorganized RT->Freeside integration to support Internal (single RT/Freeside database) and XMLRPC interfaces.
All the UI stuff is handled the same either way.
Integration type is changed by setting $RT::URI::freeside::IntegrationType to either 'Internal' or 'XMLRPC' in your RT_SiteConfig.pm.


Index: Menu
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Elements/Menu,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -u -d -r1.1.1.3 -r1.2
--- Menu	3 Dec 2004 20:38:08 -0000	1.1.1.3
+++ Menu	11 Mar 2005 01:34:31 -0000	1.2
@@ -78,7 +78,7 @@
 % } else {
 % $sep=0;
 % }
-<li style="<%$style%>"><A HREF="<%$RT::WebPath%>/<%$toptabs->{$tab}->{'path'}%>" style="font-size: <%$size%>;" class="<%$class%>" 
+<li style="<%$style%>"><A HREF="<% ($toptabs->{$tab}->{'path'} =~ /^http/) ? '' : "${RT::WebPath}/" %><%$toptabs->{$tab}->{'path'}%>" style="font-size: <%$size%>;" class="<%$class%>" 
 <%($class eq 'currenttopnav') ? "name='focus'" : ""|n %> 
 <% !$level && "accesskey='".$accesskey++."'" |n%>><% $toptabs->{$tab}->{'title'}%></A>
 %# Second-level items

Index: Header
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Elements/Header,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Header	10 Dec 2004 21:35:30 -0000	1.5
+++ Header	11 Mar 2005 01:34:30 -0000	1.6
@@ -78,7 +78,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
   <tr> 
     <td rowspan=2><img border=0 alt="freeside" src="<%$RT::WebImagesURL%>/small-logo.png" width="92" height="62"></td>
-    <td align="left" rowspan=2><font size=6><% FS::Conf->new->config('company_name') %> Ticketing</font></td>
+    <td align="left" rowspan=2><font size=6><% &RT::URI::freeside::FreesideGetConfig('company_name') %> Ticketing</font></td>
     <td align="right" valign="top">
 % if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) {
 <SPAN STYLE="display: none"><A HREF="#skipnav"><&|/l&>Skip Menu</&></A> |</SPAN>
@@ -102,7 +102,7 @@
         <tr>
           <td align=right>
             <FONT SIZE="-3">
-              <A HREF="http://www.sisd.com/freeside">Freeside</A>&nbsp;v<% $FS::VERSION %><BR>
+              <A HREF="http://www.sisd.com/freeside">Freeside</A>&nbsp;v<% &RT::URI::freeside::FreesideVersion() %><BR>
              <A HREF="../docs/">Documentation</A><BR>
             </FONT>
           </td>
@@ -124,6 +124,7 @@
 
 $r->headers_out->{'Pragma'} = 'no-cache';
 $r->headers_out->{'Cache-control'} = 'no-cache';
+require RT::URI::freeside;
 </%INIT>
 
 <%ARGS>

Index: Tabs
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Elements/Tabs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Tabs	10 Dec 2004 00:04:49 -0000	1.4
+++ Tabs	11 Mar 2005 01:34:31 -0000	1.5
@@ -64,7 +64,7 @@
 	};
 my $basetabs = {
                   ' A'=> { title => 'Billing Main',
-                           path  => '../',
+                           path  => &RT::URI::freeside::FreesideURL(),
                          },
                     A => { #title => loc('Homepage'),
                            title => 'Ticketing Main',
@@ -93,6 +93,8 @@
 if (!defined $topactions) {
    $topactions = $basetopactions;
 }
+
+  require RT::URI::freeside;
                     
   # Now let callbacks add their extra tabs
   $m->comp('/Elements/Callback',