Merge branch '0.8.x' into userdesign

diff --combined lib/common.php
index bcf2e5d0c7dfaefa0bc8e3ab266cc50ed7007888,bbd9f78c3e1df660ff6c37fc9302a3da7a57b317..eb8a2b8736cab98b153d217c73bcf075d390e9f1
--- 1/lib/common.php
--- 2/lib/common.php
+++ b/lib/common.php
@@@ -71,15 -71,6 +71,15 @@@ $config 
          array('name' => 'Just another Laconica microblog',
                'server' => $_server,
                'theme' => 'default',
 +              'skin' => 'default',
 +              'design' =>
 +              array('backgroundcolor' => '#F0F2F5',
 +                    'contentcolor' => '#FFFFFF',
 +                    'sidebarcolor' => '#CEE1E9',
 +                    'textcolor' => '#000000',
 +                    'linkcolor' => '#002E6E',
 +                    'backgroundimage' => null,
 +                    'disposition' => 1),
                'path' => $_path,
                'logfile' => null,
                'logo' => null,
@@@ -120,10 -111,6 +120,10 @@@
          array('server' => null,
                'dir' => INSTALLDIR . '/avatar/',
                'path' => $_path . '/avatar/'),
 +        'background' =>
 +        array('server' => null,
 +              'dir' => INSTALLDIR . '/background/',
 +              'path' => $_path . '/background/'),
          'public' =>
          array('localonly' => true,
                'blacklist' => array(),
@@@ -213,9 -200,11 +213,11 @@@
          'file_quota' => 5000000,
          'user_quota' => 50000000,
          'monthly_quota' => 15000000,
+         'uploads' => true,
          ),
          'group' =>
          array('maxaliases' => 3),
+         'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/')
          );
  
  $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');

diff --combined theme/base/css/display.css
index 794fa9f643a80d69641b2ff9ac98e473921381e6,9e35d015d1a0296d1f464fe580e0f66339fed9ca..2153ce9a01e03f00866899826c38778fb26230a7
--- 1/theme/base/css/display.css
--- 2/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@@ -77,8 -77,7 +77,8 @@@ margin:0 0 18px 0
  form label {
  font-weight:bold;
  }
 -input.checkbox {
 +input.checkbox,
 +input.radio {
  position:relative;
  top:2px;
  left:0;
@@@ -155,7 -154,8 +155,8 @@@ font-weight:bold
  #form_invite legend,
  #form_notice_delete legend,
  #form_password_recover legend,
- #form_password_change legend {
+ #form_password_change legend,
+ .form_entity_block legend {
  display:none;
  }
  
@@@ -169,8 -169,7 +170,8 @@@ margin-bottom:0
  margin-bottom:11px;
  }
  
 -.form_settings input.checkbox {
 +.form_settings input.checkbox,
 +.form_settings input.radio {
  margin-top:3px;
  margin-left:0;
  }
@@@ -182,19 -181,13 +183,19 @@@ margin-left:11px
  float:left;
  width:90%;
  }
 -
 +.form_settings label.radio {
 +margin-top:0;
 +margin-right:47px;
 +margin-left:11px;
 +width:auto;
 +}
  
  #form_login p.form_guide,
  #form_register #settings_rememberme p.form_guide,
  #form_openid_login #settings_rememberme p.form_guide,
  #settings_twitter_remove p.form_guide,
 -#form_search ul.form_data #q {
 +#form_search ul.form_data #q,
 +#design_background-image_onoff p.form_guide {
  margin-left:0;
  }
  
@@@ -629,7 -622,8 +630,8 @@@ display:block
  .entity_send-a-message a,
  .entity_edit a,
  .form_user_nudge input.submit,
- .entity_nudge p {
+ .entity_nudge p,
+ .form_make_admin input.submit {
  border:0;
  padding-left:20px;
  }