X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Fmenubar.html;h=ffe83ec571a404f6e1c469af9f4fe12525da4833;hp=4d2700cc51f6e23d143518071e54fb80bc3ab57c;hb=f48ffc61601d08024aeff19ecd07d7420fc4e5b3;hpb=8588f3c0bfbcbeb58dd25a57b5ea375cec00279a

diff --git a/httemplate/elements/menubar.html b/httemplate/elements/menubar.html
index 4d2700cc5..ffe83ec57 100644
--- a/httemplate/elements/menubar.html
+++ b/httemplate/elements/menubar.html
@@ -5,7 +5,9 @@ Example:
   include( '/elements/menubar.html',
            
            #options hashref (optional)
-           { 'newstyle' => 1, #may become the default at some point
+           { 'newstyle' => 1,  #may become the default at some point
+             'url_base' => '', #prepended to menubar URLs, for convenience
+             'selected' => '', #currently selected label
            },
 
            #menubar entries (required)
@@ -18,59 +20,9 @@ Example:
 </%doc>
 %if ( $opt->{'newstyle'} ) {
 
-%  #false laziness w/header.html... shouldn't these just go in freeside.css?
-
-   <style type="text/css">
-   a.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-weight:bold;*/
-            /*padding-left:12px;
-            padding-right:12px;*/
-            padding-left:4px;
-            padding-right:4px;
-            text-decoration:none;
-            overflow:visible;
-            filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666')
-   }
-   
-   a.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-weight:bold;*/
-            /*padding-left:12px;
-            padding-right:12px;*/
-            padding-left:4px;
-            padding-right:4px;
-            text-decoration:none;
-            overflow:visible;
-            filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079')
-   }
-   </style>
-
-   <TABLE BGCOLOR="#000000" BORDER=0 CELLSPACING=0 CELLPADDING=4>
-     <TR>
-       <TD STYLE="background-image:url(<%$fsurl%>images/gray-black-side.png); background-repeat:repeat-y;padding-left:0px">
-         &nbsp;&nbsp;
-       </TD>
-       <TD>
-         <% join(' ', @html ) %>
-       </TD>
-       <TD STYLE="background-image:url(<%$fsurl%>images/black-gray-side.png); background-repeat:repeat-y;padding-right:0px">
-         &nbsp;&nbsp;
-       </TD>
-     </TR>
-   </TABLE>
+   <DIV CLASS="fstabs">
+   <% join('', @html ) %>
+   </DIV>
 
 %} else {
 
@@ -93,16 +45,19 @@ while (@_) {
   if ( $opt->{'newstyle'} ) {
 
     my $dclass = $item eq $opt->{'selected'}
-                   ? 'fsblackbuttonselected'
-                   : 'fsblackbutton';
+                   ? 'fstabselected'
+                   : 'fstab';
+
+    $style = qq( CLASS="$dclass" );
 
-    $style =
-      qq( CLASS="$dclass" ).
-      qq( onMouseOver="this.className='fsblackbuttonselected'; return true;" ).
-      qq( onMouseOut="this.className='$dclass'; return true;" );
   }
 
-  push @html, qq!<A HREF="$url_base$url" $style>$item</A>!;
+  if ($item eq 'popup') {
+   push @html, $url;
+  }
+  else {
+    push @html, qq!<A HREF="$url_base$url" $style>$item</A>!;
+  }
 
 }