From b44f5753d523ea7aedfe64dc2bcbb027d81872f2 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Tue, 17 Nov 2009 21:48:00 +0000
Subject: [PATCH 1/3] Update form_settings layout

---
 theme/base/css/display.css | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index a6a93c405c..96e169d6dc 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -120,16 +120,21 @@ float:left;
 .form_settings .form_data textarea,
 .form_settings .form_data select,
 .form_settings .form_data input {
-margin-left:11px;
+margin-left:1.795%;
 float:left;
+width:39%;
 }
+.form_settings .form_data textarea {
+width:63%;
+}
+
 .form_settings .form_data input.submit {
 margin-left:0;
 }
 
 .form_settings label {
 margin-top:2px;
-width:152px;
+width:24%;
 }
 
 .form_actions label {
@@ -166,7 +171,7 @@ display:none;
 
 .form_settings .form_data p.form_guide {
 clear:both;
-margin-left:163px;
+margin-left:26%;
 margin-bottom:0;
 }
 
@@ -224,6 +229,10 @@ margin-left:29px;
 #form_search .submit {
 margin-left:11px;
 }
+#form_search .form_data input {
+width:auto;
+}
+
 
 address {
 float:left;
@@ -1340,6 +1349,7 @@ display:block;
 #settings_design_color .form_data .swatch {
 padding:11px;
 margin-left:0;
+width:auto;
 }
 
 .instructions ul {

From 2c2861b867dc7acccf02dd2cea11280a3c768c1c Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Tue, 17 Nov 2009 21:52:33 +0000
Subject: [PATCH 2/3] Added form_data class

---
 actions/designadminpanel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 024cbe2518..dcf5605af1 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -174,7 +174,7 @@ class DesignAdminPanelForm extends Form
 
         $themes = array_combine($themes, $themes);
 
-        $this->out->elementStart('ul');
+        $this->out->elementStart('ul', 'form_data');
         $this->out->elementStart('li');
 
         $this->out->dropdown('theme', _('Theme'),

From 63ebb033bf5a991eefdfb0cfff25eed8629a9365 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 17 Nov 2009 16:24:48 -0800
Subject: [PATCH 3/3] Declare global usage in common.php so setup works right
 when called from phpunit tests

We end up running the tests through a function in PHPUnit, so we don't have automatic global scope at the top level of files all the time...
---
 lib/common.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/common.php b/lib/common.php
index 063d7d9d99..203b37c872 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -83,6 +83,9 @@ function _sn_to_path($sn)
     return $p;
 }
 
+// Save our sanity when code gets loaded through subroutines such as PHPUnit tests
+global $default, $config, $_server, $_path;
+
 // try to figure out where we are. $server and $path
 // can be set by including module, else we guess based
 // on HTTP info.