From a404926bbec025159de0611ce95783488a8bd241 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Jul 2009 23:22:06 +0000
Subject: [PATCH] resolve style weirdness (fallout from RT integration),
 especially non-fixed-width comment boxes, menu/searchbar differences, RT#1169

---
 httemplate/elements/header.html             | 89 +++++++++++++++++++----------
 httemplate/elements/menu.html               |  6 +-
 httemplate/elements/xmenu.css               |  2 +
 httemplate/elements/xmenu.top.css           |  2 +
 rt/FREESIDE_MODIFIED                        |  3 +
 rt/etc/RT_SiteConfig.pm                     |  2 +
 rt/html/Elements/Header                     |  3 +-
 rt/html/NoAuth/css/3.5-default/freeside.css | 75 +-----------------------
 rt/html/NoAuth/css/3.5-default/misc.css     |  5 +-
 rt/html/Ticket/Display.html                 |  4 +-
 10 files changed, 82 insertions(+), 109 deletions(-)

diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 0bbd4fd8c..9d062cf9a 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -10,6 +10,7 @@
 
     <% include('menu.html', 'freeside_baseurl' => $fsurl,
                             'position'         => $menu_position,
+                            'nocss'            => $nocss,
               ) |n
     %>
 
@@ -17,7 +18,7 @@
 
     <SCRIPT TYPE="text/javascript">
       function clearhint_search_cust (what) {
-        if ( what.value == '(cust #, name, company or phone)' )
+        if ( what.value == '(cust #, name, company or contact phone)' )
           what.value = '';
       }
 
@@ -32,7 +33,7 @@
       }
 
       function clearhint_search_svc (what) {
-        if ( what.value == '(user, email, ip, mac, or domain)' )
+        if ( what.value == '(user, email, ip, mac, domain or svc phone #)' )
           what.value = '';
       }
 
@@ -71,9 +72,16 @@ input.fsblackbutton {
 	 border-left-color:#cccccc;
 	 border-right-color:#aaaaaa;
 	 border-bottom-color:#aaaaaa;
+         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;
 	 overflow:visible;
 	 filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666')
 }
@@ -86,12 +94,40 @@ input.fsblackbuttonselected {
 	 border-left-color:#cccccc;
 	 border-right-color:#aaaaaa;
 	 border-bottom-color:#aaaaaa;
+         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;
 	 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;
+         */
+         vertical-align:bottom;
+         text-align:right;
+         font-family: Arial,Verdana,Helvetica,sans-serif;
+         padding-left: 0px;
+         padding-right: 0px;
+         padding-top: 0px;
+         padding-bottom: 0px;
+         margin-left:0px;
+         margin-right:0px;
+         margin-top:0px;
+         margin-bottom:1px;
+}
+
 </style>
 
     <TABLE WIDTH="100%" CELLSPACING=0 CELLPADDING=0>
@@ -111,7 +147,7 @@ input.fsblackbuttonselected {
 
 
         <TD COLSPAN="2" ALIGN="right" STYLE="padding:0px 8px 0px 0px" BGCOLOR="#000000">
-          <TABLE CELLSPACING=0 CELLPADDING=0 BGCOLOR="#333333" BORDER=1>
+          <TABLE CELLSPACING=0 CELLPADDING=0 BGCOLOR="#000000" 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>
@@ -136,17 +172,11 @@ input.fsblackbuttonselected {
       <TR>
 
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
-          <FORM ACTION="<%$fsurl%>edit/cust_main.cgi" METHOD="GET" STYLE="margin:0">
-            <INPUT TYPE="submit" VALUE="New customer" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="vertical-align:bottom; font-size:100%">
-          </FORM>
-        </TD>
-
-        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
 % 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 #, name, company or phone)" SIZE="28" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="vertical-align:bottom;text-align:right"><BR>
-            <A HREF="<%$fsurl%>search/report_cust_main.html" STYLE="color: #ffffff; font-size: 70%">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:70%">
+            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name, company or contact phone)" SIZE="29" 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>
+            <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>
 % }
         </TD>
@@ -155,9 +185,9 @@ input.fsblackbuttonselected {
 % if ( $conf->exists('address2-search') ) { 
             <FORM ACTION="<%$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0;display:inline">
               <INPUT TYPE="hidden" NAME="address2_on" VALUE="1">
-              <INPUT NAME="address2_text" TYPE="text" VALUE="(Unit #)" SIZE="4" onFocus="clearhint_search_address2(this);" onClick="clearhint_search_address2(this);" STYLE="vertical-align:bottom;text-align:right;margin-bottom:1px">
+              <INPUT NAME="address2_text" TYPE="text" VALUE="(Unit #)" SIZE="4" onFocus="clearhint_search_address2(this);" onClick="clearhint_search_address2(this);" CLASS="fstext">
               <BR>
-              <INPUT TYPE="submit" VALUE="Search units" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%;padding-left:2px;padding-right:2px">
+              <INPUT TYPE="submit" VALUE="Search units" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:2px;padding-right:2px">
             </FORM>
 % } 
         </TD>
@@ -166,14 +196,12 @@ input.fsblackbuttonselected {
 % if ( $curuser->access_right('View invoices') ) { 
 
             <FORM ACTION="<%$fsurl%>search/cust_bill.html" METHOD="GET" STYLE="margin:0;display:inline">
-              <INPUT NAME="invnum" TYPE="text" VALUE="(inv #)" SIZE="4" onFocus="clearhint_search_invoice(this);" onClick="clearhint_search_invoice(this);" STYLE="vertical-align:bottom;text-align:right;margin-bottom:1px">
+              <INPUT NAME="invnum" TYPE="text" VALUE="(inv #)" SIZE="10" onFocus="clearhint_search_invoice(this);" onClick="clearhint_search_invoice(this);" CLASS="fstext">
+              <BR>
 %   if ( $curuser->access_right('List invoices') ) { 
-
-                <A HREF="<%$fsurl%>search/report_cust_bill.html" STYLE="color: #ffffff; font-size: 70%">Advanced</A>
+                <A HREF="<%$fsurl%>search/report_cust_bill.html" STYLE="color: #ffffff; 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:70%">
+              <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:0px;padding-right:0px">
             </FORM>
 % } 
         </TD>
@@ -181,19 +209,19 @@ input.fsblackbuttonselected {
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
 % if ( $curuser->access_right('View customer services') ) {
           <FORM ACTION="<%$fsurl%>search/cust_svc.html" METHOD="GET" STYLE="margin:0">
-            <INPUT NAME="search_svc" TYPE="text" VALUE="(user, email, ip, mac, or domain)" SIZE="26" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="vertical-align:bottom;text-align:right"><BR>
-            <A NOTYET="<%$fsurl%>search/svc_Smarter.html" STYLE="color: #000000; font-size: 70%">Advanced</A>
-            <INPUT TYPE="submit" VALUE="Search services" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%">
+            <INPUT NAME="search_svc" TYPE="text" VALUE="(user, email, ip, mac, domain or svc phone #)" SIZE="32" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" CLASS="fstext"><BR>
+            <A NOTYET="<%$fsurl%>search/svc_Smarter.html" STYLE="color: #000000; font-size:11px">Advanced</A>
+            <INPUT TYPE="submit" VALUE="Search services" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
           </FORM>
 % }
         </TD>
 
-        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right" STYLE="padding-right:4px">
+        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right" STYLE="padding-left:4px;padding-right:4px">
 % if ( $conf->config("ticket_system") ) { 
           <FORM ACTION="<% FS::TicketSystem->baseurl %>index.html" METHOD="GET" STYLE="margin:0">
-            <INPUT NAME="q" TYPE="text" VALUE="(ticket #, subject, email or fulltext:text)" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" STYLE="vertical-align:bottom;text-align:right"><BR>
-            <A HREF="<% FS::TicketSystem->baseurl %>Search/Build.html" STYLE="color: #ffffff; font-size: 70%">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:70%;padding-left:2px;padding-right:2px">
+            <INPUT NAME="q" TYPE="text" VALUE="(ticket #, subject, email or fulltext:text)" SIZE=26 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>
+            <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>
 % }
         </TD>
@@ -229,10 +257,10 @@ input.fsblackbuttonselected {
 
           <TABLE CELLSPACING=0 CELLPADDING=0 BGCOLOR="#000000" WIDTH="100%">
             <TR>
-              <TD ALIGN="left" STYLE="padding-bottom:1px;border-bottom:1px solid #999999"><% include('/elements/about_freeside.html') %></TD>
+              <TD ALIGN="left" STYLE="padding-bottom:1px;border-bottom:1px solid #999999"><% include('/elements/about_freeside.html') |n %></TD>
             </TR>
             <TR>
-              <TD ALIGN="right" STYLE="padding-bottom:1px"><% include('/elements/about_rt.html') %></TD>
+              <TD ALIGN="right" STYLE="padding-bottom:1px"><% include('/elements/about_rt.html') |n %></TD>
             </TR>
           </TABLE>
 
@@ -255,7 +283,7 @@ input.fsblackbuttonselected {
 <%init>
 
 my( $title, $menubar, $etc, $head ) = ( '', '', '', '' );
-my( $nobr ) = ( 0 );
+my( $nobr, $nocss ) = ( 0, 0 );
 if ( ref($_[0]) ) {
   my $opt = shift;
   $title   = $opt->{title};
@@ -263,6 +291,7 @@ if ( ref($_[0]) ) {
   $etc     = $opt->{etc};
   $head    = $opt->{head};
   $nobr    = $opt->{nobr};
+  $nocss   = $opt->{nocss};
 } else {
   ($title, $menubar) = ( shift, shift );
   $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index a24af7b37..999fa43ea 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -12,7 +12,9 @@
 
 % }
 
-<link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
+% unless ( $opt{'nocss'} ) {
+  <link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
+% }
 
 <SCRIPT TYPE="text/javascript">
 
@@ -446,6 +448,8 @@ if ( $conf->config('ticket_system') ) {
       'Ticketing start page',
     ],
 }
+$menu{'New customer'} = [ $fsurl.'edit/cust_main.cgi', 'Add a new customer' ]
+  if $curuser->access_right('New customer');
 $menu{'Reports'} = [ \%report_menu, 'Lists, reporting and graphing' ]
   if keys %report_menu;
 $menu{'Tools'} = [ \%tools_menu, 'Tools' ]
diff --git a/httemplate/elements/xmenu.css b/httemplate/elements/xmenu.css
index 97c7da8bb..33ad90caa 100644
--- a/httemplate/elements/xmenu.css
+++ b/httemplate/elements/xmenu.css
@@ -128,6 +128,8 @@
 
 	padding:			1px 5px 1px 5px;
 
+	font-size:		14px;
+
 	/* color:				black; */
 	color:				white;
 	text-decoration:	none;
diff --git a/httemplate/elements/xmenu.top.css b/httemplate/elements/xmenu.top.css
index 75917031b..e86e4a6a8 100644
--- a/httemplate/elements/xmenu.top.css
+++ b/httemplate/elements/xmenu.top.css
@@ -125,6 +125,8 @@
 
 	padding:			1px 5px 1px 5px;
 
+	font-size:		16px;
+
 	/* color:				black; */
 	color:				white;
 	text-decoration:	none;
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index 948eeab66..cf2ac4289 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -15,6 +15,7 @@ lib/RT/URI/freeside/XMLRPC.pm
  html/Elements/Tabs
  html/Elements/Footer
  html/Elements/CollectionAsTable/Row #backport from 3.3-TESTING
+ html/Ticket/Display.html
 html/Ticket/Elements/AddCustomers
 html/Ticket/Elements/EditCustomers
 html/Ticket/Elements/ShowCustomers
@@ -23,6 +24,8 @@ html/Ticket/Elements/ShowCustomers
 html/Ticket/ModifyCustomers.html
 html/NoAuth/images/small-logo.png
  html/NoAuth/css/3.5-default/main.css
+ html/NoAuth/css/3.5-default/misc.css
+ html/NoAuth/css/3.5-default/titlebox.css
 html/NoAuth/css/3.5-default/freeside.css
 
 html/Widgets/TitleBoxStart
diff --git a/rt/etc/RT_SiteConfig.pm b/rt/etc/RT_SiteConfig.pm
index c3d6a66ce..7a6f40735 100644
--- a/rt/etc/RT_SiteConfig.pm
+++ b/rt/etc/RT_SiteConfig.pm
@@ -49,4 +49,6 @@ $RT::QuickCreateLong = 0; #set to true to cause quick ticket creation to
                           #redirect to the "long" ticket creation screen
                           #instead of just creating a ticket with the subject.
 
+Set($MessageBoxWidth , 80);
+
 1;
diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index ab92e3287..a32784e35 100644
--- a/rt/html/Elements/Header
+++ b/rt/html/Elements/Header
@@ -49,6 +49,7 @@
               'title' => $Title,
               'head'  => $head,
               'nobr'  => 1,
+              'nocss' => 1,
           }) |n
 %>
 
@@ -79,7 +80,7 @@ if ($Refresh && $Refresh > 0) {
 $head .= <<END;
 <link rel="shortcut icon" href="$RT::WebImagesURL/favicon.png" type="image/png" />
 <link rel="stylesheet" href="$RT::WebPath/NoAuth/css/$RT::WebDefaultStylesheet/main-squished.css" type="text/css" media="all" />
-<link rel="stylesheet" href="RT::WebPath/NoAuth/css/print.css" type="text/css" media="print" />
+<link rel="stylesheet" href="$RT::WebPath/NoAuth/css/print.css" type="text/css" media="print" />
 END
 
 if ( $RSSAutoDiscovery ) {
diff --git a/rt/html/NoAuth/css/3.5-default/freeside.css b/rt/html/NoAuth/css/3.5-default/freeside.css
index a595061b9..5e7e0a04a 100644
--- a/rt/html/NoAuth/css/3.5-default/freeside.css
+++ b/rt/html/NoAuth/css/3.5-default/freeside.css
@@ -1,77 +1,3 @@
-.black {
-        background-color: #000000;
-        color: #ffffff;
-        background-position: left top;
-        vertical-align: top;
-        text-align: left;
-}
-
-.blackright { 
-        background-color: #000000;
-        color: #ffffff;
-        background-position: left top;
-        vertical-align: center;
-        text-align: right;
-        font-size:16px;
-        padding-right:4px
-}
-
-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;
-        font-family: Arial, Verdana, Helvetica, sans-serif;
-        font-weight:bold;
-        padding-left:12px;
-        padding-right:12px;
-        overflow:visible;
-        filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666')
-}
-
-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;
-        font-family: Arial, Verdana, Helvetica, sans-serif;
-        font-weight:bold;
-        padding-left:12px;
-        padding-right:12px;
-        overflow:visible;
-        filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079')
-}
-
-.darkmediumgray {
-        background-color: #aaaaaa;
-        background-position: left top;
-        vertical-align: top;
-        text-align: left;
-}
-.darkmediumgrayright { 
-        background-color: #aaaaaa;
-        background-position: left top;
-        vertical-align: top;
-        text-align: right;
-}
-.bggray {
-        background-color: #e8e8e8;
-        background-position: left top;
-        vertical-align: top;
-        text-align: left;
-}
-.bggrayright { 
-        background-color: #e8e8e8;
-        background-position: left top;
-        vertical-align: top;
-        text-align: right;
-}
 
 div.titlebox {
         background: #d4d4d4;
@@ -80,3 +6,4 @@ div.titlebox {
 div.titlebox-title {
         background: #e8e8e8;
 }
+
diff --git a/rt/html/NoAuth/css/3.5-default/misc.css b/rt/html/NoAuth/css/3.5-default/misc.css
index ddb2e687b..cf7068a87 100755
--- a/rt/html/NoAuth/css/3.5-default/misc.css
+++ b/rt/html/NoAuth/css/3.5-default/misc.css
@@ -46,7 +46,8 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 body {
-    font-family: Verdana, sans-serif;
+    /* font-family: Verdana, sans-serif; */
+    font-family: Arial, Verdana, Helvetica, sans-serif;
     font-size: 76%;
     margin: 0;
     /* background-color: white; */
@@ -74,9 +75,11 @@ body {
 .evenline { background-color: white; }
 .oddline { background-color: #ddd; }
 
+/*
 td {
     padding: 0.1em 0.5em 0.1em 0.5em;
 }
+*/
 
 .clear { clear: both; }
 
diff --git a/rt/html/Ticket/Display.html b/rt/html/Ticket/Display.html
index 17d00a00c..ca6939821 100644
--- a/rt/html/Ticket/Display.html
+++ b/rt/html/Ticket/Display.html
@@ -46,11 +46,11 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <& /Elements/Header, 
-    Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &>
+    Title => loc("Ticket #[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $TicketObj, 
     current_tab => 'Ticket/Display.html?id='.$TicketObj->id,
-    Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &>
+    Title => loc("Ticket #[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &>
 
 <& /Elements/ListActions, actions => \@Actions &>
 <& /Elements/Callback, _CallbackName => 'BeforeShowSummary', Ticket => $TicketObj, %ARGS &>
-- 
2.11.0