ticket system integration framework and skin RT

5 files changed, 48 insertions, 14 deletions

diff --git a/rt/html/Elements/Footer b/rt/html/Elements/Footer
index 5c833f886..052bf87e9 100644
--- a/rt/html/Elements/Footer
+++ b/rt/html/Elements/Footer
@@ -28,9 +28,11 @@
 <td>
 % }
 <& /Elements/Callback, %ARGS &>
+<!--
 <div class="bpscredits">
 &#187;&#124;&#171; <&|/l, $RT::VERSION &>RT [_1] from <a href="http://bestpractical.com">Best Practical Solutions, LLC</a>.</&>
 </div>
+-->
 % if ($Debug) {
 <HR>
 <b><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></b>
diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index 23ab5f781..92c186bd5 100644
--- a/rt/html/Elements/Header
+++ b/rt/html/Elements/Header
@@ -42,10 +42,9 @@ ONLOAD="
 >
 <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
   <tr> 
-    <td colspan=2><a href="http://bestpractical.com"><img src="<%$RT::WebImagesURL%>/bplogo.gif" alt="" width="230" height="50"></a></td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td width="50%" align="right">
+    <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=7>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>
 <A  HREF="<%$RT::WebPath%><% $Prefs %>" ><&|/l&>Preferences</&></A>
@@ -59,6 +58,33 @@ ONLOAD="
 <&|/l&>Not logged in.</&>
 % }
     </td>
+
+  </tr>
+  <tr>
+
+    <td align=right valign=bottom>
+      <table>
+        <tr>
+          <td align=right>
+            <FONT SIZE="-3">
+             Freeside <% $FS::VERSION %><BR>
+             <A HREF="http://www.sisd.com/freeside">Freeside&nbsp;home&nbsp;page</A><BR>
+             <A HREF="docs/">Documentation</A><BR>
+            </FONT>
+          </td>
+          <td bgcolor=#000000></td>
+          <td align=left>
+            <FONT SIZE="-3">
+             RT <% $RT::VERSION %><BR>
+             <A HREF="http://www.bestpractical.com/rt">RT&nbsp;home&nbsp;page</A><BR>
+             <A HREF="http://wiki.bestpractical.com/">Documentation</A><BR>
+            </FONT>
+          </td>
+
+        </tr>
+      </table>
+    </td>
+
   </tr>
 </table>
 <%INIT>
diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout
index 685317581..86b6b565e 100644
--- a/rt/html/Elements/PageLayout
+++ b/rt/html/Elements/PageLayout
@@ -21,12 +21,12 @@
 %# 
 %# 
 %# END LICENSE BLOCK
-<table class="darkblue" border=0 cellspacing=0 cellpadding=0 width="100%">
-  <th class="titlebox" align="left"><span class="rtname"><%$AppName%></span>
+<table class="lightgray" border=0 cellspacing=0 cellpadding=0 width="100%">
+  <th class="lightgray" align="left" width=50%><span class="rtname"><%$AppName%></span>
   </th>
       <span class="topactions">
 % foreach my $action (sort keys %{$topactions}) {
-        <td class="darkblueright">
+        <td class="lightgrayright">
         <%$topactions->{"$action"}->{'html'} |n %>
         </td>
 % }
@@ -35,18 +35,18 @@
 <table border=0 cellspacing=0 cellpadding=0 width="100%" height="100%">
 %# Vertical menu
 <TR height="100%">
-<TD valign="top" width="140" class="blue">
+<TD valign="top" width="140" class="lightgray">
           <& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &>
 </TD>
 <td valign="top">
 <table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
-  <td class="blue" valign="top">
+  <td class="mediumgray" valign="top">
     <span class="title"><%$title%></span>
 </td>
 </tr>
 <tr>
-<td class="blueright" valign="top">
+<td class="whiteright" valign="top">
     <span class="nav"> 
 % if ($actions) {
 % my @actions;
@@ -57,7 +57,8 @@
 % push @actions,  "<A class='nav' HREF=\"".$RT::WebPath."/".$actions->{$action}->{'path'}."\">".$actions->{$action}->{'title'}."</A>";
 % }
 %  }
-<% join(" | ", @actions) | n %>
+%#<% join(" | ", @actions) | n %>
+<% '['. join("] [", @actions). ']' | n %>
 % if ($subactions) {
 % my @actions;
 % foreach my $action (sort keys %{$subactions}) {
@@ -95,5 +96,5 @@ $tabs => undef
 $actions => undef
 $subactions => undef
 $title => $m->callers(-1)->path
-$AppName => undef
+$AppName => ''
 </%ARGS>
diff --git a/rt/html/Elements/SimpleSearch b/rt/html/Elements/SimpleSearch
index 4a0d10656..85f37403f 100644
--- a/rt/html/Elements/SimpleSearch
+++ b/rt/html/Elements/SimpleSearch
@@ -23,5 +23,5 @@
 %# END LICENSE BLOCK
 <form action="<% $RT::WebPath %>/index.html">
 <input size="12" name="q" autocomplete="off" accesskey="0">
-<input type="submit" value="<&|/l&>Search</&>">&nbsp;
+<input type="submit" value="<&|/l&>Search tickets</&>">&nbsp;
 </form>
diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs
index 4db3849c6..6791e5062 100644
--- a/rt/html/Elements/Tabs
+++ b/rt/html/Elements/Tabs
@@ -40,7 +40,12 @@ my $basetopactions = {
 	B => { html => $m->scomp('/Elements/SimpleSearch') 
 		}
 	};
-my $basetabs = {     A => { title => loc('Homepage'),
+my $basetabs = {
+                  ' A'=> { title => 'Billing Main',
+                           path  => '..',
+                         },
+                    A => { #title => loc('Homepage'),
+                           title => 'Ticketing Main',
                            path => '',
                          },
                     B => { title => loc('Tickets'),