Merge branch '0.7.x' into conversationtree

diff --combined lib/action.php
index 3e43ffe3e3ee1427d53c571ee4fb52b639b31aa6,6b130b6d553484e0be8d7e790e9706303b8bfac8..bab987de6cf2d55063d44ee67e611d934a637894
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -98,15 -98,15 +98,15 @@@ class Action extends HTMLOutputter // l
              Event::handle('EndShowHTML', array($this));
          }
          if (Event::handle('StartShowHead', array($this))) {
-         $this->showHead();
+             $this->showHead();
              Event::handle('EndShowHead', array($this));
          }
          if (Event::handle('StartShowBody', array($this))) {
-         $this->showBody();
+             $this->showBody();
              Event::handle('EndShowBody', array($this));
          }
          if (Event::handle('StartEndHTML', array($this))) {
-         $this->endHTML();
+             $this->endHTML();
              Event::handle('EndEndHTML', array($this));
          }
      }
@@@ -347,7 -347,7 +347,7 @@@
      {
          $this->elementStart('body', (common_current_user()) ? array('id' => $this->trimmed('action'),
                                                                      'class' => 'user_in')
-                                                             : array('id' => $this->trimmed('action')));
+                             : array('id' => $this->trimmed('action')));
          $this->elementStart('div', array('id' => 'wrap'));
          if (Event::handle('StartShowHeader', array($this))) {
              $this->showHeader();
@@@ -431,10 -431,10 +431,10 @@@
                                      _('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect');
                  }
                  $this->menuItem(common_local_url('invite'),
-                                  _('Invite'),
-                                  sprintf(_('Invite friends and colleagues to join you on %s'),
-                                  common_config('site', 'name')),
-                                  false, 'nav_invitecontact');
+                                 _('Invite'),
+                                 sprintf(_('Invite friends and colleagues to join you on %s'),
+                                         common_config('site', 'name')),
+                                 false, 'nav_invitecontact');
                  $this->menuItem(common_local_url('logout'),
                                  _('Logout'), _('Logout from the site'), false, 'nav_logout');
              }
@@@ -591,7 -591,10 +591,10 @@@
                                          'class' => 'system_notice'));
          $this->element('dt', null, _('Page notice'));
          $this->elementStart('dd');
-         $this->showPageNotice();
+         if (Event::handle('StartShowPageNotice', array($this))) {
+             $this->showPageNotice();
+             Event::handle('EndShowPageNotice', array($this));
+         }
          $this->elementEnd('dd');
          $this->elementEnd('dl');
      }
@@@ -629,7 -632,7 +632,7 @@@
          $this->elementStart('div', array('id' => 'aside_primary',
                                           'class' => 'aside'));
          if (Event::handle('StartShowExportData', array($this))) {
-         $this->showExportData();
+             $this->showExportData();
              Event::handle('EndShowExportData', array($this));
          }
          if (Event::handle('StartShowSections', array($this))) {
@@@ -858,12 -861,10 +861,12 @@@
          }
          if ($lm) {
              header('Last-Modified: ' . date(DATE_RFC1123, $lm));
 -            if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 -                $ims = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']);
 +            if (array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
 +                $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
 +                $ims = strtotime($if_modified_since);
                  if ($lm <= $ims) {
 -                    $if_none_match = $_SERVER['HTTP_IF_NONE_MATCH'];
 +                    $if_none_match = (array_key_exists('HTTP_IF_NONE_MATCH', $_SERVER)) ?
 +                      $_SERVER['HTTP_IF_NONE_MATCH'] : null;
                      if (!$if_none_match ||
                          !$etag ||
                          $this->_hasEtag($etag, $if_none_match)) {

diff --combined theme/base/css/display.css
index 10fc636385326a05b3148ed6be5902e9d0e622fe,8029a5eee17266e4a0cdd2ff0443ce03db8b56ca..547752b5105601e5155682f8359f03c8efca8e0c
--- 1/theme/base/css/display.css
--- 2/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@@ -248,10 -248,10 +248,10 @@@ display:none
  }
  
  #site_notice {
 -position:absolute;
 -top:65px;
 -right:18px;
 -width:250px;
 +float:right;
 +clear:right;
 +margin-top:7px;
 +margin-right:18px;
  width:24%;
  }
  #page_notice {
@@@ -397,9 -397,6 +397,9 @@@ border-radius:7px
  border-style:solid;
  border-width:1px;
  }
 +#shownotice #content {
 +min-height:0;
 +}
  
  #content_inner {
  position:relative;
@@@ -495,7 -492,7 +495,7 @@@ line-height:1.618
  /* entity_profile */
  .entity_profile {
  position:relative;
- width:67.702%;
+ width:74.702%;
  min-height:123px;
  float:left;
  margin-bottom:18px;
@@@ -531,12 -528,15 +531,15 @@@ margin-bottom:4px
  .entity_profile .entity_nickname {
  margin-left:11px;
  display:inline;
- font-weight:bold;
  }
  .entity_profile .entity_nickname {
  margin-left:0;
  }
- 
+ .entity_profile .fn,
+ .entity_profile .nickname {
+ font-size:1.1em;
+ font-weight:bold;
+ }
  .entity_profile .entity_fn dd:before {
  content: "(";
  font-weight:normal;
@@@ -558,7 -558,7 +561,7 @@@ display:none
  /*entity_actions*/
  .entity_actions {
  float:right;
- margin-left:4.35%;
+ margin-left:2.35%;
  max-width:25%;
  }
  .entity_actions h2 {
@@@ -730,7 -730,7 +733,7 @@@ clear:both
  float:left;
  width:100%;
  border-top-width:1px;
 -border-top-style:dashed;
 +border-top-style:dotted;
  }
  .notices li {
  list-style-type:none;
@@@ -769,14 -769,16 +772,14 @@@ overflow:hidden
  font-weight:bold;
  }
  
 -.notice .author .photo {
 -margin-bottom:0;
 -}
 -
  .vcard .photo {
  display:inline;
  margin-right:11px;
 -margin-bottom:11px;
  float:left;
  }
 +#shownotice .vcard .photo {
 +margin-bottom:4px;
 +}
  .vcard .url {
  text-decoration:none;
  }
@@@ -813,10 -815,9 +816,10 @@@ clear:left
  float:left;
  font-size:0.95em;
  margin-left:59px;
 -width:70%;
 +width:65%;
  }
 -#showstream .notice div.entry-content {
 +#showstream .notice div.entry-content,
 +#shownotice .notice div.entry-content {
  margin-left:0;
  }
  
@@@ -1147,18 -1148,6 +1150,18 @@@ clear:both
  margin-bottom:0;
  }
  
 +#form_settings_design #settings_design_color .form_data,
 +#form_settings_design #color-picker {
 +float:left;
 +}
 +#form_settings_design #settings_design_color .form_data {
 +width:400px;
 +margin-right:28px;
 +}
 +
 +.instructions ul {
 +list-style-position:inside;
 +}
  .instructions p,
  .instructions ul {
  margin-bottom:18px;