Merge branch '0.8.x' into design_reset

* 0.8.x: (32 commits)
  admin indicators in groups
  show section with admins in sidebar of group
  update to latest (r76) version of XMPPHP
  better output for common error handler
  fix logging error
  note when going background
  change name of constructor for xmppdaemon
  add a lot more logging to xmppdaemon
  error in get_option_value wasn't returning a value
  reformat commandline.inc
  if not in daemon mode, xmppdaemon sends log to stdout
  extract log-line formatting to its own function
  got my background/foreground logic backwards
  twitter status fetcher takes an id argument
  more efficient fixup of conversations
  commandline processing handles errors better
  xmppdaemon.php can stay in foreground
  command line arg handling a little more flexible
  Daemon can optionally not go into the background
  don't canonicalize people's text into URLs
  ...

Conflicts:
	theme/base/css/display.css

diff --git a/lib/designsettings.php b/lib/designsettings.php
index 9650679ac5b620c51f356c1d57d07e3235abfbac..5def5053fdc7fa17a834f67cfb33ccb4d2f63f2a 100644 (file)
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -212,18 +212,19 @@ class DesignSettingsAction extends AccountSettingsAction
                                          'maxlength' => '7',
                                          'size' => '7',
                                          'value' => '#' . $lcolor->hexValue()));
+            $this->elementEnd('li');
 
-           $this->elementEnd('li');
+        } catch (WebColorException $e) {
+            common_log(LOG_ERR, 'Bad color values in design ID: ' .$design->id);
+        }
 
-       } catch (WebColorException $e) {
-           common_log(LOG_ERR, 'Bad color values in design ID: ' .
-               $design->id);
-       }
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
 
-       $this->elementEnd('ul');
-       $this->elementEnd('fieldset');
+        $this->submit('defaults', _('Use defaults'), 'submit form_action-default',
+            'defaults', _('Restore default designs'));
 
-       $this->element('input', array('id' => 'settings_design_reset',
+        $this->element('input', array('id' => 'settings_design_reset',
                                      'type' => 'reset',
                                      'value' => 'Reset',
                                      'class' => 'submit form_action-primary',

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index df4e756330579bbfb078d48f3090e3056a6c0df1..eb9c4652fce19283e52964299cbe264d52a3e9f5 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -206,6 +206,10 @@ border-radius:4px;
 padding:0 7px;
 }
 
+.form_settings input.form_action-default {
+margin-right:11px;
+}
+.form_settings input.form_action-default,
 .form_settings input.form_action-primary {
 padding:0;
 }