Merge branch 'master' of git.freeside.biz:/home/git/freeside

4 files changed, 47 insertions, 57 deletions

diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css
index ebeee985d..1f51f51b9 100644
--- a/httemplate/elements/freeside.css
+++ b/httemplate/elements/freeside.css
@@ -3,6 +3,12 @@
   /* font-family: Verdana, Arial, Helvetica, sans-serif; */
 }
 
+h1 {
+  margin: 0;
+  padding: 0;
+  font-weight: normal;
+}
+
 pre {
   font-family: monospace;
 }
@@ -172,10 +178,13 @@ div.fstabs {
 div.fstabcontainer {
   background-color:#ffffff;
   padding:8px;
+  clear: left;
+/*
   border-left:1px solid #7e0079;
   border-right:1px solid #7e0079;
   border-bottom:1px solid #7e0079;
   border-top:1px solid #7e0079;
+*/
 }
 
 .fscontainer {
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 858be71da..a9e74babf 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -161,9 +161,9 @@ Example:
 %# page content starts here
         <TD CLASS="background" HEIGHT="100%" VALIGN="top"> <!-- WIDTH="100%"> -->
 
-          <FONT SIZE=6>
+          <H1>
             <% $title_noescape || encode_entities($title) %>
-          </FONT>
+          </H1>
 
 % unless ( $nobr ) {
           <BR><BR>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index b1bc7f52a..233c496ac 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -5,7 +5,6 @@
              'nobr'  => 1,
           }
 &>
-<BR>
 
 % my @part_tag = $cust_main->part_tag;
 % if ( $conf->config('cust_tag-location') eq 'top' && @part_tag ) {
diff --git a/httemplate/view/cust_main/menu.html b/httemplate/view/cust_main/menu.html
index baea3ad24..13b3963fb 100644
--- a/httemplate/view/cust_main/menu.html
+++ b/httemplate/view/cust_main/menu.html
@@ -1,43 +1,31 @@
 <style type="text/css">
 #menu_ul {
   padding: 0;
-  margin: 0px 0px 18px 0px;
+  margin: .5em 0 0 0;
+  font-size: smaller;
 }
+
 #menu_ul li {
+  margin: 0;
   float: left;
   list-style: none;
   position: relative;
 }
+
 #menu_ul a {
-  background: #dddddd;
   display: block;
-  padding: 6px 8px;
-  margin: 8px 8px 8px 0px;
-/*  margin: 0px 0px 8px 0px; */
+  margin: 0;
+  padding: .5em .75em;
+  background: #ffffff;
   color: #525151;
-  font-size: 13px;
-  font-weight: bold;
   white-space: nowrap;
-  border-top-left-radius:2px;
-  border-top-right-radius:2px;
+  text-decoration: none;
+  border-top: thin solid #CFDEFF;
 }
-#menu_ul a.current_show {
-  background: #ffffff;
-  border-top: 1px solid #7e007f;
-  border-left: 1px solid #7e007f;
-  border-right: 1px solid #7e007f;
-  border-bottom: 1px solid #ffffff;
 
-  display: block;
-  padding: 6px 8px;
-  margin: 8px 8px 8px 0px;
-/*  margin: 0px 0px 8px 0px; */
-  color: #525151;
-  font-size: 13px;
+#menu_ul a.current_show {
   font-weight: bold;
-  white-space: nowrap;
-  border-top-left-radius:2px;
-  border-top-right-radius:2px;
+  background: #cfdeff;
 }
 
 #menu_ul ul {
@@ -46,54 +34,48 @@
   display:none;
   position: absolute;
   top: 100%;
-  left: -1px;
+  left: 0;
   background: #ffffff;
-  border: 1px solid #7e007f;
+  border-bottom: thin solid #CFDEFF;
 }
 
 #menu_ul ul li {
+  margin: 0;
+  padding: 0;
   float: none;
-  border-style: none;
-  display: inline;
-  width: 100%;
 }
 
 #menu_ul ul a {
-  padding: 0px 10px;
+  border-top: thin solid #CFDEFF;
   color: #333333;
-  font-size: 13px;
-  font-weight: normal;
   background: transparent;
 }
-#menu_ul ul a:hover  {
-  color: #7e0079;
-  background: #fff8fb; /* ?? too pink? */
-  border-top-left-radius:0px;
-  border-top-right-radius:0px;
-}
 
-#menu_ul a.current_menu, #menu_ul a.hover {
+#menu_ul a:hover {
+  background: #cfdeff;
+  text-decoration: underline;
   color: #7e0079;
 }
+
 </style>
 <script src="<% $p %>elements/jquery.js"></script>
 <script type="text/javascript">
+
 $(document).ready(function() {
-        $('#menu_ul > li').hover(function(){
-                $('a:first', this).addClass('hover');
-                $('ul:first', this).show();
-                if ($('.current_menu:first', this).length == 0) {
-                        $('img[src*="dropdown_arrow_white"]', this).show();
-                        $('img[src*="dropdown_arrow_grey"]', this).hide();
-                }
-        }, function(){
-                $('ul:first', this).hide();
-                $('a:first', this).removeClass('hover');
-                if ($('.current_menu:first', this).length == 0) {
-                        $('img[src*="dropdown_arrow_white"]', this).hide();
-                        $('img[src*="dropdown_arrow_grey"]', this).show();
-                }
-        });
+	var openmenu;
+	function closemenu () {
+		if (openmenu !== undefined) {
+			openmenu.hide();
+			openmenu = undefined;
+		}
+	}		
+	$('#menu_ul > li').hover(function(){
+		closemenu();
+		openmenu = $('ul:first', this);
+		openmenu.show();
+	}, function(){
+		closemenu();
+	});
 });
 </script>