more RT integration / reskin / 2.1, RT#6640

7 files changed, 120 insertions, 78 deletions

diff --git a/httemplate/elements/calendar-win2k-2.css b/httemplate/elements/calendar-win2k-2.css
index 6f37b7dcd..7b8de002a 100644
--- a/httemplate/elements/calendar-win2k-2.css
+++ b/httemplate/elements/calendar-win2k-2.css
@@ -12,6 +12,7 @@
   cursor: default;
   background: #d4c8d0;
   font-family: tahoma,verdana,sans-serif;
+  z-index:2;
 }
 
 .calendar table {
diff --git a/httemplate/elements/freeside-menu.css b/httemplate/elements/freeside-menu.css
index 8bdec31fa..165f7f4b9 100644
--- a/httemplate/elements/freeside-menu.css
+++ b/httemplate/elements/freeside-menu.css
@@ -1,66 +1,70 @@
 input.fsblackbutton {
-	 background-color:#333333;
-	 color: #ffffff;
-	 border:1px solid;
-	 border-top-color:#cccccc;
-	 border-left-color:#cccccc;
-	 border-right-color:#aaaaaa;
-	 border-bottom-color:#aaaaaa;
+	 background-color:#aaaaaa;
+	 color: #333333;
+	 border:1px solid #cccccc;
+
+	 -moz-border-radius: 8px;
+	 -webkit-border-radius: 8px;
+	 border-radius: 8px;
+
          font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-weight:bold;
 	 padding-left:12px;
 	 padding-right:12px;
          padding-top:0px;
          padding-bottom:0px;
-         margin-left:0px;
-         margin-right:0px;
-         margin-top:2px;
-         margin-bottom:0px;
+
+         margin-bottom:4px;
 	 overflow:visible;
-	 filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666')
+}
+
+input.fsblackbutton:hover,input.fsblackbutton:focus,
+input.fsblackbuttonselected:hover, input.fsblackbuttonselected:focus {
+        background:#aaaaaa;
 }
 
 input.fsblackbuttonselected {
-	 background-color:#7e0079;
-	 color: #ffffff;
-	 border:1px solid;
-	 border-top-color:#cccccc;
-	 border-left-color:#cccccc;
-	 border-right-color:#aaaaaa;
-	 border-bottom-color:#aaaaaa;
+	 background-color:#aaaaaa;
+	 color: #7e0079;
+	 border:1px solid #7e0079;
+
+	 -moz-border-radius: 8px;
+	 -webkit-border-radius: 8px;
+	 border-radius: 8px;
+
          font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-weight:bold;
 	 padding-left:12px;
 	 padding-right:12px;
          padding-top:0px;
          padding-bottom:0px;
-         margin-left:0px;
-         margin-right:0px;
-         margin-top:2px;
-         margin-bottom:0px;
+
+         margin-bottom:4px;
 	 overflow:visible;
-	 filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079')
 }
 
 input.fstext {
-         border: 2px inset #eee;
-	 /*border-top-color:#aaaaaa;
-	 border-left-color:#aaaaaa;
-	 border-right-color:#cccccc;
-	 border-bottom-color:#cccccc;
-         */
+         border: 1px solid #666666;
+         padding: 1px;
+
          vertical-align:bottom;
          text-align:right;
          font-family: Arial,Verdana,Helvetica,sans-serif;
          font-size: 13px;
-         padding-left: 0px;
-         padding-right: 0px;
-         padding-top: 0px;
-         padding-bottom: 0px;
-         margin-left:0px;
-         margin-right:0px;
-         margin-top:0px;
-         margin-bottom:1px;
+
+         margin:0px;
+}
+
+input.fstext:focus {
+         border: 1px solid #7e0079;
+}
+
+a.fslink {
+        text-decoration: underline;
+}
+
+a:hover.fslink {
+        color: #7e0079;
 }
 
 a.fsblackbutton {
@@ -79,7 +83,6 @@ a.fsblackbutton {
          font-size:16px;
          text-decoration:none;
          overflow:visible;
-         filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666')
 }
 
 a.fsblackbuttonselected,
@@ -100,7 +103,6 @@ a:visited:hover.fsblackbutton {
          font-size:16px;
          text-decoration:none;
          overflow:visible;
-         filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079')
 }
 
 a.fsdarkbutton {
@@ -119,7 +121,6 @@ a.fsdarkbutton {
          font-size:16px;
          text-decoration:none;
          overflow:visible;
-         filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff555555',EndColorStr='#ff666666')
 }
 
 a.fsdarkbuttonselected,
@@ -140,6 +141,5 @@ a:visited:hover.fsdarkbutton {
          font-size:16px;
          text-decoration:none;
          overflow:visible;
-         filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079')
 }
 
diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css
index c310e2fa0..73434f360 100644
--- a/httemplate/elements/freeside.css
+++ b/httemplate/elements/freeside.css
@@ -10,7 +10,21 @@ a:link, a:visited {
   /* text-decoration: none; */
   color: #000000;
 } 
-/* a:hover {  text-decoration: underline } */
+
+a:hover {
+  text-decoration: underline;
+  color: #7e0079;
+}
+
+textarea, input {
+  border: 1px solid #666666;
+  padding: 1px;
+}
+
+textarea:focus, input:focus {
+  background-color: #ffffdd;
+  border: 1px solid #7e0079;
+}
 
 /* a:focus { background-color: #ccccee } */
 
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 08de3b686..11211607b 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -84,7 +84,7 @@ Example:
         <td align=left BGCOLOR="#ffffff"> <!-- valign="top" -->
           <font size=6><% $company_name || 'ExampleCo' %></font>
         </td>
-        <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><% getotaker %>&nbsp;</b> <FONT SIZE="-2">[ <a href="javascript:void(0);" onClick="logout();">logout</a> ]</FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000">Preferences</a>
+        <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><% getotaker %>&nbsp;</b> <FONT SIZE="-2"><a href="javascript:void(0);" onClick="logout();">logout</a></FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000">Preferences</a>
 %         if ( $conf->config("ticket_system")
 %              && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) {
             | <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000">Ticketing preferences</a>
@@ -102,32 +102,12 @@ Example:
 
       <TR>
 
-        <TD COLSPAN="5" WIDTH="100%" STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079" BGCOLOR="#cccccc">
+        <TD COLSPAN="7" WIDTH="100%" STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079" BGCOLOR="#cccccc">
           <SCRIPT TYPE="text/javascript">
             document.write(myBar);
           </SCRIPT>
         </TD>
 
-
-        <TD COLSPAN="2" ALIGN="right" STYLE="padding:1px 8px 0px 0px;border-top: 1px solid #7e0079" BGCOLOR="#cccccc">
-          <TABLE CELLSPACING=0 CELLPADDING=0 BGCOLOR="#cccccc" BORDER=0>
-            <TR>
-              <TD ALIGN="right" STYLE="padding-right:3px;padding-bottom:1px;border-right:1px solid #999999"><% include('/elements/about_freeside.html') |n %></TD>
-              <TD ALIGN="left" STYLE="padding-left:3px;padding-bottom:1px"><% include('/elements/about_rt.html') |n %></TD>
-            </TR>
-          </TABLE>
-        </TD>
-
-      </TR>
-
-      <TR>
-        <TD COLSPAN="7" WIDTH="100%" HEIGHT="2px" STYLE="padding:0" BGCOLOR="#cccccc">
-        </TD>
-      </TR>
-      
-      <TR>
-        <TD COLSPAN="7" WIDTH="100%" HEIGHT="4px" STYLE="padding:0" BGCOLOR="#cccccc">
-        </TD>
       </TR>
 
 % }
@@ -138,7 +118,7 @@ Example:
 % if ( $curuser->access_right('List prospects') ) {
           <FORM ACTION="<%$fsurl%>search/prospect_main.html" METHOD="GET" STYLE="margin:0">
             <INPUT NAME="search_prospect" TYPE="text" VALUE="<% $prospect_label |n %>" STYLE="width:155px" onFocus="clearhint_search_prospect(this);" onClick="clearhint_search_prospect(this);" CLASS="fstext"><BR>
-            <A HREF="<%$fsurl%>search/report_prospect_main.html" STYLE="color: #ffffff; font-size: 11px">Adv</A>
+            <A HREF="<%$fsurl%>search/report_prospect_main.html" CLASS="fslink" STYLE="font-size: 11px">Adv</A>
             <INPUT TYPE="submit" VALUE="Search prospects" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px"">
           </FORM>
 % }
@@ -148,7 +128,7 @@ Example:
 % if ( $curuser->access_right('List customers') ) {
           <FORM ACTION="<%$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0">
             <INPUT NAME="search_cust" TYPE="text" VALUE="<% $cust_label |n %>" STYLE="width:<%$cust_width%>px" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" CLASS="fstext"><BR>
-            <A HREF="<%$fsurl%>search/report_cust_main.html" STYLE="color: #ffffff; font-size: 11px">Advanced</A>
+            <A HREF="<%$fsurl%>search/report_cust_main.html" CLASS="fslink" STYLE="font-size: 11px">Advanced</A>
             <INPUT TYPE="submit" VALUE="Search customers" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
           </FORM>
 % }
@@ -170,7 +150,7 @@ Example:
             <FORM ACTION="<%$fsurl%>search/cust_bill.html" METHOD="GET" STYLE="margin:0;display:inline">
               <INPUT NAME="invnum" TYPE="text" VALUE="<% $inv_label |n %>" STYLE="width:56px" onFocus="clearhint_search_invoice(this);" onClick="clearhint_search_invoice(this);" CLASS="fstext">
 %   if ( $curuser->access_right('List invoices') ) { 
-              <A HREF="<%$fsurl%>search/report_cust_bill.html" STYLE="color: #ffffff; font-size: 11px">Adv</A>\
+              <A HREF="<%$fsurl%>search/report_cust_bill.html" CLASS="fslink" STYLE="font-size: 11px">Adv</A>\
 %   } 
 <BR><INPUT TYPE="submit" VALUE="Search invoices" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px;margin-top:3px">
             </FORM>
@@ -191,7 +171,7 @@ Example:
 % if ( $conf->config("ticket_system") ) { 
           <FORM ACTION="<% FS::TicketSystem->baseurl %>index.html" METHOD="GET" STYLE="margin:0">
             <INPUT NAME="q" TYPE="text" VALUE="<% $ticketing_label |n %>" STYLE="width:223px" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" CLASS="fstext"><BR>
-            <A HREF="<% FS::TicketSystem->baseurl %>Search/Build.html" STYLE="color: #ffffff; font-size:11px">Advanced</A>
+            <A HREF="<% FS::TicketSystem->baseurl %>Search/Build.html" CLASS="fslink" STYLE="font-size:11px">Advanced</A>
             <INPUT TYPE="submit" VALUE="Search tickets" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
           </FORM>
 % }
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index a26624ee8..a4fcde6a1 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -489,6 +489,26 @@ $config_menu{'Miscellaneous'} = [ \%config_misc, ''    ]
   if $curuser->access_right('Edit advertising sources')
   || $curuser->access_right('Edit global advertising sources');
 
+
+my $wiki = 'http://www.freeside.biz/mediawiki/index.php';
+my $doc_link = $conf->config('support-key')
+                 ? "$wiki/Supported:Documentation"
+                 : $curuser->access_right('Configuration')
+                   ? "$wiki/Freeside:1.9:Documentation"
+                   : "$wiki/Freeside:1.9:Documentation:User";
+
+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{'separator'} = '';
+$help_menu{"About Freeside v$FS::VERSION"} = [ 'XXXfinishme', 'doh!' ];
+$help_menu{"About RT v$RT::VERSION"} = [ 'http://www.bestpractical.com/rt', 'Request Tracker Homepage' ]
+  if $conf->config('ticket_system') eq 'RT_Internal';
+
+
 tie my %menu, 'Tie::IxHash',
   'Billing Main'   => [ $fsurl, 'Billing start page', ],
 ;
@@ -521,6 +541,8 @@ $menu{'Configuration'} = [ \%config_menu, 'Configuraiton and setup' ]
   || $curuser->access_right('Phone configuration')
   || $curuser->access_right('Edit advertising sources')
   || $curuser->access_right('Edit global advertising sources');
+$menu{'Help'} = [ \%help_menu, '' ];
+
 
 use vars qw($gmenunum);
 $gmenunum = 0;
diff --git a/httemplate/elements/xmenu.top.css b/httemplate/elements/xmenu.top.css
index a545be0bd..eb4da64e6 100644
--- a/httemplate/elements/xmenu.top.css
+++ b/httemplate/elements/xmenu.top.css
@@ -126,45 +126,70 @@
 	padding:			1px 5px 1px 5px;
 
 	font-size:		16px;
+        /* font-weight: bold; */
 
-	/* color:				black; */
-	color:				white;
+	color:				black;
+	/* color:				white; */
 	text-decoration:	none;
+	/* text-decoration:	underline; */
 
 	/* IE5.0 Does not paint borders and padding on inline elements without a height/width */
 	height:		expression(constExpression(ie50 ? "17px" : "auto"));
 
-         background-color:#333333;
+/*         background-color:#333333;
 	 border:1px solid;
 	 border-top-color:#cccccc;
 	 border-left-color:#cccccc;
 	 border-right-color:#aaaaaa;
 	 border-bottom-color:#aaaaaa;
+*/
+/*        -moz-border-radius: 15px;
+        -webkit-border-radius: 15px;
+        border-radius: 15px;
+        behavior: url(border-radius.htc);
+*/
+
+        border: 1px solid #cccccc;
 
          margin-right: 4px
 
 }
 
 .webfx-menu-bar a:link {
-	color: white;
+	/* color: white; */
+        color: black;
 }
 
 .webfx-menu-bar a:hover {
-	/* color:			black; */
-	color:			white;
+	 color:			black;
+	/*  color:			white; */
 	/* background:		rgb(120,172,255);	 */
 	/* background:		#BC79B8; */
-        background:		#7e0079;
+        /* background:		#7e0079; */
+        text-decoration: underline;
+        /* font-weight: bold; */
 	/* border-left:	1px solid rgb(234,242,255);
 	border-right:	1px solid rgb(0,66,174);
 	border-top:		1px solid rgb(234,242,255);
 	border-bottom:	1px solid rgb(0,66,174); */
 
-	 border:1px solid;
+/*	 border:1px solid;
 	 border-top-color:#cccccc;
 	 border-left-color:#cccccc;
 	 border-right-color:#aaaaaa;
 	 border-bottom-color:#aaaaaa;
+*/
+/*         -moz-border-radius: 8px;
+        -webkit-border-radius: 8px;
+        border-radius: 8px;
+        behavior: url(border-radius.htc);
+*/
+
+        /* border: 1px solid #7e0079; */
+/*        border: 1px solid #d8d8d8;
+        background: #bbbbbb;
+*/
+        color: #7e0079;
 
 }
 
diff --git a/httemplate/elements/xmenu.top.js b/httemplate/elements/xmenu.top.js
index 8d81035a2..b9df515c4 100644
--- a/httemplate/elements/xmenu.top.js
+++ b/httemplate/elements/xmenu.top.js
@@ -370,7 +370,7 @@ WebFXMenuButton.prototype.toString = function () {
 				)) +
 			">" +
 			this.text + 
-			(this.subMenu ? "<img class='arrow' src='" + webfxMenuImagePath + "arrow.down.png'>" : "") +				
+			(this.subMenu ? "<img class='arrow' src='" + webfxMenuImagePath + "arrow.down.black.png'>" : "") +				
 			"</a>";
 };