4.x style

[freeside.git] / httemplate / elements / menubar.html

diff --git a/httemplate/elements/menubar.html b/httemplate/elements/menubar.html
index fe49f7b..ffe83ec 100644 (file)
--- a/httemplate/elements/menubar.html
+++ b/httemplate/elements/menubar.html
@@ -19,10 +19,10 @@ Example:
 
 </%doc>
 %if ( $opt->{'newstyle'} ) {
-%  my $s = '<FONT STYLE="border-bottom:1px solid #7e0079">';
 
-   <% join("$s &nbsp; </FONT>", ( '', @html, '' ) ) %>
-   <BR>
+   <DIV CLASS="fstabs">
+   <% join('', @html ) %>
+   </DIV>
 
 %} else {
 
@@ -52,7 +52,12 @@ while (@_) {
 
   }
 
-  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>!;
+  }
 
 }