From 574ca98f39f58bcf99f19db10e4ecfdc23f7cacf Mon Sep 17 00:00:00 2001
From: "morse%netscape.com"
 <morse%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 5 Aug 2000 01:57:43 +0000
Subject: [PATCH] bug 45219, submitted by Robert O'Callahan, r=morse

git-svn-id: svn://10.0.0.236/trunk@75624 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../wallet/cookieviewer/CookieViewer.xul      | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
index 7522f68810a..efd43310b8d 100644
--- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
+++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
@@ -42,18 +42,19 @@
 
   <keyset id="keyset"/>
            
-  <tabcontrol flex="100%" align="vertical">
+  <tabcontrol flex="1" align="vertical">
     <tabbox>
       <tab id="cookiesTab" value="&tab.cookiesonsystem.label;"/>
       <tab value="&tab.bannedservers.label;"/>
       <tab id="imagesTab" style="display:none" value="&tab.bannedimages.label;"/>
 	  <spring flex="1"/>
     </tabbox>
-    <tabpanel id="panel" align="horizontal" style="width: 400px;">
-      <box class="tabpanel" id="system" flex="100%" align="vertical">
+    <tabpanel id="panel" align="horizontal" style="width: 400px;" flex="1">
+      <box class="tabpanel" id="system" flex="1" align="vertical">
           <text class="label" value="&div.cookiesonsystem.label;"/>
           <spring style="height: 10px;"/>
           <tree id="cookietree" class="inset" style="height: 15em; width: 380px;" align="vertical" 
+            flex="1"
             multiple="true" onselect="ViewCookieSelected(event);"
             onclick="ViewCookieSelected(event)"
             onkeypress="HandleKeyPress(event)">
@@ -70,15 +71,14 @@
             <treechildren id="cookielist" flex="1"/>
           </tree>
           <spring style="height: 5px;"/>
-          <titledbox style="border: 2px groove #CCCCDD;">
+          <titledbox style="border: 2px groove #CCCCDD;" orient="vertical">
             <title> <text class="label" value="&treehead.infoselected.label;"/> </title>
             <spring style="height: 5px;"/>
             <!-- labels -->
             <grid>
               <columns>
+                <column/>
                 <column flex="1"/>
-                <column/>
-                <column/>
               </columns>
               <rows>
                 <row>
@@ -108,7 +108,7 @@
               </rows>
             </grid>
           </titledbox>
-          <spring flex="5%"/>
+          <spring style="height: 5px;"/>
           <box align="horizontal">
             <button id="removeCookies" class="dialog push" disabled="true"
                           value="&button.removecookie.label;"
@@ -121,10 +121,11 @@
           <checkbox id="checkbox" value="&checkbox.label;" />
       </box>
       
-      <box class="tabpanel" id="servers" flex="100%" align="vertical">
+      <box class="tabpanel" id="servers" flex="1" align="vertical">
           <text class="label" value="&div.bannedservers.label;"/>
-          <spring flex="5%"/>
+          <spring style="height: 10px;"/>
           <tree id="permissionstree" class="inset" style="height: 30em; width: 380px;" align="vertical"
+                flex="1"
                 onkeypress="if(event.which == 46) gone_p += DeleteItemSelected('permissionstree', 'permtree_', 'permissionslist');"
                 multiple="true" onclick="ViewPermissionSelected();">
             <treecolgroup>
@@ -151,10 +152,11 @@
           <spring style="height: 5px;"/>
       </box>
 
-      <box class="tabpanel" id="images" style="display:none" flex="100%" align="vertical">
+      <box class="tabpanel" id="images" style="display:none" flex="1" align="vertical">
           <text class="label" value="&div.bannedimages.label;"/>
-          <spring flex="5%"/>
+          <spring style="height: 10px;"/>
           <tree id="imagestree" class="inset" style="height: 30em; width: 380px;" align="vertical"
+                flex="1"
                 onkeypress="if(event.which == 46) gone_i += DeleteItemSelected('imagestree', 'imgtree_', 'imageslist');"
                 multiple="true" onclick="ViewImageSelected();">
             <treecolgroup>
@@ -186,7 +188,7 @@
   
   <!-- from dialogOverlay.xul -->
   <box align="horizontal">
-    <spring flex="100%"/>
+    <spring flex="1"/>
     <box id="okCancelButtons"/>
   </box>