CHUKWA-388. Clean up user interface color. (Eric Yang)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/chukwa/trunk@812502 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 8, 2009 · 4e51c83 · 4e51c83
1 parent 353ae81
commit 4e51c83
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 34 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,8 @@ Trunk (unreleased changes)
 
   NEW FEATURES
 
+    CHUKWA-384. Added REST API charting capability. (Eric Yang)
+
     CHUKWA-369. Tolerance of collector failures. (asrabkin)
 
     CHUKWA-368. New data integrity validation tool. (asrabkin)
@@ -54,8 +56,13 @@ Trunk (unreleased changes)
 
   IMPROVEMENTS
 
+<<<<<<< .mine
+    CHUKWA-388.  Clean up user interface color.  (Eric Yang)
+
+=======
     CHUKWA-387.  Summarize mode for dumpChunks should count bytes. (asrabkin)
 
+>>>>>>> .r812501
     CHUKWA-379.  Refactor sender code. (asrabkin)
 
     CHUKWA-374.  Adaptor.getStatus() shouldn't throw exceptions. (asrabkin)

diff --git a/src/web/hicc/css/default.css b/src/web/hicc/css/default.css
@@ -1,18 +1,9 @@
 a:hover {text-decoration:underline;}
 a:link {text-decoration:none;}
 
-.formTableContent {background-color:#FFFFFF;text-align:left;vertical-align:top;}
-.formTableLeft {font-weight:bold;text-align:right;background-color:#CCCCCC;vertical-align:top;text-indent:3pt;}
-.formInput {font:normal 11px Arial;color:#3A5A87;padding-left:0px;}
-.formInput-disabled { font:normal 11px Arial;color:#3A5A87;background-color:#DDDDDD;padding-left:0px; }
-.formReadOnly {border-style:solid;border-width:1px;border-color:#C0C0C0;font:bold 11px Arial;color:#3A5A87;padding-left:0px;}
-.formTable {font:normal 11px Arial;background-color:#AAAAAA;}
-.formControlRow {font:normal 11px Arial;color:#333333;background-image:url(/images/controlBackground.jpg);background-repeat:repeat-x;}
-.formButton {font:bold 11px Arial;color:#FFFFFF;background-image:url(images/titlebar.gif);background-color:#7B0099;vertical-align:middle;border-width:1px;height:20px;border:1px solid #000;}
+.formButton {font:bold 11px Arial;color:#000000;background-image:url(images/titlebar.png);background-color:#7B0099;vertical-align:middle;border-width:1px;height:20px;border:1px solid #000;}
 .formButton:hover { font:bold 11px Arial;color:#000000;background-image:url(images/navbar-selected.gif);vertical-align:middle;border-width:1px;height:20px;border:1px solid #000; }
 .formButton-disabled {font:bold 11px Arial;color:#AAAAAA;background-color:#DDDDDD;vertical-align:middle;border-width:1px;height:20px;}
-.formRadio {width:14px;}
-.formSelect {font:normal 11px Arial;color:#3A5A87;z-index:100;}
 a.hyperlink:link {color:inherit;text-decoration:underline; }
 a.hyperlink:visited {color:inherit;text-decoration:underline; }
 a.hyperlink:hover {color:#5E76AA;text-decoration:underline;background:#E9EE94; }
@@ -132,10 +123,10 @@ body {font-family:Arial;background-color:#ffffff;}
 }
 
 .dragableBox{	/* The RSS box */
-	border-top: 1px solid #795089;
-	border-left: 1px solid #795089;
-	border-right: 1px solid #795089;
-	border-bottom: 1px solid #795089;
+	border-top: 1px solid #DBE1E6;
+	border-left: 1px solid #DBE1E6;
+	border-right: 1px solid #DBE1E6;
+	border-bottom: 1px solid #DBE1E6;
 	background-color:#FFFFFF;
 	margin:0px 0px 5px 0px; 
 }
@@ -148,8 +139,8 @@ body {font-family:Arial;background-color:#ffffff;}
 }
 
 .dragableBoxHeader{	/* Header inside RSS box */
-        color:#FFFFFF;
-        background-image:url(images/titlebar.gif);
+        color:#000000;
+        background-image:url(images/titlebar.png);
         background-repeat: repeat-x;
 	height:20px;
 	font:bold 12 Helvetica, Arial;vertical-align:middle;
@@ -221,7 +212,7 @@ body {font-family:Arial;background-color:#ffffff;}
 
 .dragableBoxEdit {
 	font-size: 10px;
-	background-color:#eeeeee;
+	background-color:#F1F4F6;
 }
 
 .dragableBoxEditLink{	/* Edit link on top of a box */
@@ -417,12 +408,12 @@ a {
 }
 
 .page_selector_table {
-border-bottom: 1px solid #cccccc;
+border-bottom: 1px solid #3875D7;
 margin: 0;
 }
 
 
-table.titlebar {font:bold 11px Arial;color:#FFFFFF;vertical-align:middle;border-width:1px;height:14px;border:1px solid #000;background-image:url(images/titlebar.gif);background-repeat:repeat-x;background-color:#7B0099;}
+table.titlebar {font:bold 11px Arial;color:#000000;vertical-align:middle;border-width:1px;height:14px;border:1px solid #000;background-image:url(images/titlebar.png);background-repeat:repeat-x;background-color:#7B0099;}
 
 table.simple {
 	border-width: 1px;
@@ -702,3 +693,6 @@ fieldset > .row:last-child {
     line-height:normal;
 }
 
+*.ygtvlabel {
+    font-size:11px;
+}
diff --git a/src/web/hicc/css/menu.css b/src/web/hicc/css/menu.css
@@ -1,15 +1,15 @@
 .menubar {
 background-repeat: repeat-x;
-background-image: url('images/titlebar.gif');
+background-image: url('images/titlebar.png');
 }
 
 #menu {
-color: #fff;
+color: #000;
 font: bold 11px/16px arial, helvetica, sans-serif;
 width: 100%;
 float: left;
 background-repeat: repeat-x;
-background-image: url('images/titlebar.gif');
+background-image: url('images/titlebar.png');
 }
 
 #menu ul {
@@ -23,13 +23,13 @@ float: left;
 }
 
 #menu h2 {
-color: #fff;
+color: #000;
 background: #000;
 text-transform: uppercase;
 }
 
 #menu a {
-color: #fff;
+color: #000;
 text-decoration: none;
 display: block;
 border-width: 0px;
@@ -38,11 +38,13 @@ padding: 2px 3px;
 }
 
 #menu a:hover {
-background: #9970A8;
+color: #fff;
+background: #3875D7;
 }
 
 #menu ul:hover {
-background: #9970A8;
+color: #fff;
+background: #3875D7;
 }
 
 #menu li {position: relative;}
@@ -71,14 +73,14 @@ div#menu ul ul ul li:hover ul
 
 div#menu ul ul table {
 width:100%;
-color: #fff;
+color: #000;
 font: bold 11px/16px arial, helvetica, sans-serif;
-background-color: #785088;
+background-color: #eeeeee;
 }
 
 div#menu ul ul td:hover {
 width:100%;
 color: #fff;
-background-color: #9970A8;
+background-color: #3875D7;
 cursor:pointer;
 }
diff --git a/src/web/hicc/css/tab.css b/src/web/hicc/css/tab.css
@@ -2,14 +2,14 @@
         font: bold 11px/16px arial, helvetica, sans-serif;
         border-style:normal;border-top:1px;border-bottom:0px;border-width:5px;border-color:#ffffff; 
         white-space: nowrap; background-color: #FDB5FF; background-image: url('images/titlebar.gif');
-        background: #9970A8;
+        background: #3875D7;
 }       
 
 .tab-hover {
         font: bold 11px/16px arial, helvetica, sans-serif;
         border-style:normal;border-top:1px;border-bottom:0px;border-width:5px;border-color:#ffffff; cursor:pointer;
         white-space: nowrap;
-        background: #9970A8;
+        background: #3875D7;
 }
 
 .tab-off {
@@ -51,7 +51,7 @@
 
 #tablist { font: bold 11px verdana, arial, sans-serif;
 	list-style-type: none;
-	height: 24px; margin: 4px 0px 0px 0px;
+	margin: 4px 0px 0px 0px;
 }
 #tablist li {
 	float: left;

diff --git a/src/web/hicc/images/loading.gif b/src/web/hicc/images/loading.gif
diff --git a/src/web/hicc/index.jsp b/src/web/hicc/index.jsp
@@ -65,13 +65,12 @@
 </table>
 </td></tr></table>
 </div>
+<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/treeview/assets/skins/sam/treeview.css" />
 <link href="css/default.css" rel="stylesheet" type="text/css">
 <style type="text/css">@import url('css/calendar.css');</style>
 <link href="css/menu.css" rel="stylesheet" type="text/css">
 <link href="css/tab.css" rel="stylesheet" type="text/css">
 <link href="css/timeframe.css" rel="stylesheet" type="text/css">
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/fonts/fonts-min.css" />
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/treeview/assets/skins/sam/treeview.css" />
 <!-- all the necessary js files -->
 <script type="text/javascript" src="./js/yahoo-dom-event.js"></script>
 <script type="text/javascript" src="./js/treeview-min.js"></script>