Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 024cbe2518f5a17f770a9e3b5271e9f6fd1ff645..dcf5605af17cc2869b0ca2888050e050c399157c 100644 (file)
--- 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'),

diff --git a/lib/common.php b/lib/common.php
index 063d7d9d99dc97105e16ed3640a0f5e2b4bf77ec..203b37c872cf62a18dc5782bd96f3d061e781eaf 100644 (file)
--- 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.

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index a6a93c405c70154892ee108698fbd754f04a192f..96e169d6dc117dda294c36ea5896cd27a0c5d35a 100644 (file)
--- 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 {