[or-cvs] [https-everywhere/master 4/9] Align rules in a grid contained in a scrollbox.

[mikeperry at torproject.org]

Author: Mike Perry <mikeperry-git fscked org>
Date: Wed, 10 Nov 2010 17:40:23 -0800
Subject: Align rules in a grid contained in a scrollbox.
Commit: 7b2641b29ae18f1b8dc6e0acd3d1689c58f56130

---
 src/chrome/content/preferences.js  |    6 +-----
 src/chrome/content/preferences.xul |   17 +++++++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index 05d0b55..b9d2725 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -33,14 +33,10 @@ function https_prefs_init(doc) {
     var ruleset = rulesets[i];
 
     if (i % row_width == 0) {
-      hbox = doc.createElement("richlistitem");
-      //hbox.setAttribute("type", "checkbox");
-      //hbox.setAttribute("style", "listitem-checkbox");
+      hbox = doc.createElement("row");
     }
 
     var newopt = doc.createElement("checkbox");
-    //newopt.setAttribute("type", "checkbox");
-    //newopt.setAttribute("style", "listcell-checkbox");
 
     // This pref should always have been created by the RuleSet constructor
     var enabled = o_httpsprefs.getBoolPref(ruleset.name);
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index 6ae92f5..0615d35 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -16,13 +16,19 @@
         ondialogcancel="https_prefs_cancel(document)">
 
     <script type="application/x-javascript" src="preferences.js"/>
-    <groupbox>
-      <caption label="Which HTTPS redirection rules should apply?" 
+    <groupbox flex="1">
+        <caption label="Which HTTPS redirection rules should apply?" 
                align="center"/>
+        <hbox flex="1" style="overflow:auto">
+          <grid class="indent" align="center">
+            <columns>
+             <column/> <column/> <column/> <column/> <column/>
+            </columns>
+            <rows id="https_everywhere_RuleSetList"/>
+          </grid>
+          <seperator orient="vertical" width="40" flex="1"/>
+        </hbox>
         <vbox>
-          <richlistbox class="indent" align="center" id="https_everywhere_RuleSetList">
-          </richlistbox>
-          <vbox>
             You can learn how to write your own rulesets
             <label id="ruleset link" 
               value="here" 
@@ -30,7 +36,6 @@
               onmouseover="event.target.style.cursor='pointer'" 
               onmouseout="event.target.style.cursor='default'" 
               onclick="window.open('https://eff.org/https-everywhere/rulesets')"/>
-          </vbox>
         </vbox>
     </groupbox>
 </dialog>
-- 
1.7.1