From 463aa9044ac49f39ffc9a60b088dc8e66b4e3f72 Mon Sep 17 00:00:00 2001
From: NIKITA <nikita@cloud.com>
Date: Fri, 29 Oct 2010 16:56:14 -0700
Subject: [PATCH] Added scrollbar to global settings grid

---
 ui/new/css/main.css          | 13 +++++++++++--
 ui/new/jsp/globalsetting.jsp | 35 +++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/ui/new/css/main.css b/ui/new/css/main.css
index cafd7dd41c1..ed2295ed1f7 100644
--- a/ui/new/css/main.css
+++ b/ui/new/css/main.css
@@ -1268,9 +1268,8 @@ a:hover {
 
 .leftmenu_panel {
 	width:221px;
-	height:auto;
+	height:100%;
 	min-height:1000px;
-	height:auto;
 	float:left;
 	background:#d6dfe5 repeat top left;
 	border-right:1px solid #aeb9c5;
@@ -2435,6 +2434,16 @@ a:hover.search_button {
 	padding:0;
 }
 
+.fixed_gridcontainer {
+	width:100%;
+	height:700px;
+	float:left;
+	overflow-y:scroll;
+	overflow-y:auto;
+	overflow-x:hidden;
+	margin:0;
+	padding:0;
+}
 .grid_rows {
 	width:100%;
 	height:auto;
diff --git a/ui/new/jsp/globalsetting.jsp b/ui/new/jsp/globalsetting.jsp
index b613e1ccee0..ca9d8117973 100644
--- a/ui/new/jsp/globalsetting.jsp
+++ b/ui/new/jsp/globalsetting.jsp
@@ -56,7 +56,8 @@
                     </div>
                 </div>                     
             </div>            
-            <div id="grid_content">             	
+            <div id="grid_content" class="fixed_gridcontainer"> 
+                        	
          	</div>               
         </div>        
         <div class="grid_botactionpanel">
@@ -66,23 +67,25 @@
     </div>
 </div>
 <!-- global setting grid template (begin) -->
-<div id="globalsetting_template" class="grid_rows even" style="display:none">
-    <div class="grid_row_cell" style="width: 35%;">
-        <div class="row_celltitles" id="name">
+
+    <div id="globalsetting_template" class="grid_rows even" style="display:none">
+        <div class="grid_row_cell" style="width: 35%;">
+            <div class="row_celltitles" id="name">
+            </div>
+        </div>
+        <div class="grid_row_cell" style="width: 23%;">
+            <div class="row_celltitles" id="value">
+            </div>
+            <input class="text" id="value_edit" style="width: 200px; display: none;" type="text" />
+            <div id="value_edit_errormsg" style="display: none">
+            </div>
+        </div>
+        <div class="grid_row_cell" style="width: 40%;">
+            <div class="row_celltitles" id="description">description
+            </div>
         </div>
     </div>
-    <div class="grid_row_cell" style="width: 23%;">
-        <div class="row_celltitles" id="value">
-        </div>
-        <input class="text" id="value_edit" style="width: 200px; display: none;" type="text" />
-        <div id="value_edit_errormsg" style="display: none">
-        </div>
-    </div>
-    <div class="grid_row_cell" style="width: 27%;">
-        <div class="row_celltitles" id="description">description
-        </div>
-    </div>
-</div>
+
 <!-- global setting grid template (end) -->
 
 <div id="dialog_alert_restart_management_server" title="Alert" style="display:none">