more ACL and re-skinning work, now with RT!

4 files changed, 50 insertions, 11 deletions

diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css
new file mode 100644
index 000000000..5908e6aab
--- /dev/null
+++ b/httemplate/elements/freeside.css
@@ -0,0 +1,15 @@
+* {
+  font-family: Arial, Verdana, Helvetica, sans-serif;
+}
+
+A:link IMG, A:visited { border-style: none }
+A:focus {text-decoration: underline }
+
+a:link, a:visited {
+  /* text-decoration: none; */
+  color: #000000;
+} 
+/* a:hover {  text-decoration: underline } */
+
+/* a:focus { background-color: #ccccee } */
+
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 49814577e..0eb5695ce 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -16,6 +16,7 @@
     <script type="text/javascript" src="<%=$fsurl%>elements/cssexpr.js"></script>
     <script type="text/javascript" src="<%=$fsurl%>elements/xmenu.js"></script>
     <link href="<%=$fsurl%>elements/xmenu.css" type="text/css" rel="stylesheet">
+    <link href="<%=$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
     <%
 
       tie my %report_menu, 'Tie::IxHash',
@@ -183,10 +184,16 @@
     </SCRIPT>
 
     <SCRIPT TYPE="text/javascript">
-      function clearhint_search_cust () {
-        alert(this);
-        if ( this.value='(cust #, name or company)' )
-          this.value = '';
+      function clearhint_search_cust (what) {
+        if ( what.value = '(cust #, name or company)' )
+          what.value = '';
+      }
+    </SCRIPT>
+
+    <SCRIPT TYPE="text/javascript">
+      function clearhint_search_ticket (what) {
+        if ( what.value = '(ticket # or subject string)' )
+          what.value = '';
       }
     </SCRIPT>
 
@@ -200,7 +207,7 @@
           <IMG BORDER=0 ALT="freeside" SRC="<%=$fsurl%>images/small-logo.png">
         </td>
         <td align=left rowspan=2 BGCOLOR="#ffffff"> <!-- valign="top" -->
-          <font size=6><%= $conf->config('company_name') %> Billing</font>
+          <font size=6><%= $conf->config('company_name') || 'ExampleCo' %></font>
         </td>
         <td align=right valign=top BGCOLOR="#ffffff">Logged in as <b><%= getotaker %>&nbsp</b><br><FONT SIZE="-2"><a href="<%=$fsurl%>pref/XXXwritethis">Preferences</a>&nbsp;<BR><BR></FONT>
         </td>
@@ -248,13 +255,13 @@
         </TD>
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
           <FORM ACTION="<%=$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0">
-            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name or company)" SIZE="23" onFocus="clearhint_search_cust" onClick="clearhint_search_cust">
+            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name or company)" SIZE="23" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="text-align:right">
             <INPUT TYPE="submit" VALUE="Search customers">
           </FORM>
         </TD>
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
           <FORM ACTION="<%=$fsurl%>rt/index.html" METHOD="GET" STYLE="margin:0">
-            <INPUT NAME="q" TYPE="text" VALUE="" onFocus="clearhint_search_ticket" onClick="clearhint_search_ticket">
+            <INPUT NAME="q" TYPE="text" VALUE="(ticket # or subject string)" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" STYLE="text-align:right">
             <INPUT TYPE="submit" VALUE="Search tickets">
           </FORM>
         </TD>
diff --git a/httemplate/elements/xmenu.css b/httemplate/elements/xmenu.css
index 5bb8a0deb..60881b813 100644
--- a/httemplate/elements/xmenu.css
+++ b/httemplate/elements/xmenu.css
@@ -55,9 +55,14 @@
 	border:			1px solid white;
 }	
 
-.webfx-menu a:visited,
-.webfx-menu a:visited:hover {
+.webfx-menu a:visited {
 	color:			black;
+	border:			1px solid white;
+}
+
+.webfx-menu a:hover {
+	color:			black;
+	border:			1px solid #7e0079;
 }
 
 .webfx-menu a:hover {
@@ -98,11 +103,12 @@
 	/* border:			1px solid #7E0079; */
 	/* border:			1px solid #000000; */
 	/* border: none */
+	color:				white;
 
 	padding:		2px;
 	
 	font-family:	Verdana, Helvetica, Sans-Serif;
-	font-size:		11px;
+	/* font-size:		11px; */
 	
 	/* IE5.0 has the wierdest box model for inline elements */
 	padding:		expression(constExpression(ie50 ? "0px" : "2px"));
@@ -132,6 +138,10 @@
 	height:		expression(constExpression(ie50 ? "17px" : "auto"));
 }
 
+.webfx-menu-bar a:link {
+	color: white;
+}
+
 .webfx-menu-bar a:hover {
 	/* color:			black; */
 	color:			white;
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 8b70ff490..733e5dc15 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -186,6 +186,13 @@ if ( $cgi->param('browse')
     push @cust_main, @{&companysearch};
   }
 
+  if ( $cgi->param('search_cust') ) {
+    $sortby = \*company_sort;
+    $orderby = "ORDER BY LOWER(company || ' ' || last || ' ' || first )";
+    warn "smart searching for: ". $cgi->param('search_cust');
+    push @cust_main, smart_search( 'search' => $cgi->param('search_cust') );
+  }
+
   @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
     if ! $cgi->param('cancelled')
        && (
@@ -313,7 +320,7 @@ END
       $conf->config('ticket_system-custom_priority_field-values');
   }
 
-  print "<BR><BR>". $pager. &table(). <<END;
+  print "<BR><BR>". $pager. include('/elements/table-grid.html'). <<END;
       <TR>
         <TH></TH>
         <TH>(bill) name</TH>