Merge branch 'uiredesign' of ../evan into uiredesign

diff --combined lib/action.php
index f9f5acf2c7dc6a57a8aaa9de60a63fb45dc88276,9534073ec7f57b5b2257215e068026475bc1aff0..90bb678703268c1d3ea67fd43f4765f697587418
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -297,7 -297,12 +297,12 @@@ class Action extends HTMLOutputter // l
      function showCore()
      {
          $this->elementStart('div', array('id' => 'core'));
+         $this->elementStart('dl', array('id' => 'site_nav_local_views'));
+         $this->element('dt', null, _('Local views'));
+         $this->elementStart('dd');
          $this->showLocalNav();
+         $this->elementEnd('dd');
+         $this->elementEnd('dl');
          $this->showContentBlock();
          $this->showAside();
          $this->elementEnd('div');
@@@ -335,7 -340,7 +340,7 @@@
        $this->showPageNotice();
        $this->elementEnd('dd');
        $this->elementEnd('dl');
 -    }
 +      }
  
      // SHOULD overload (unless there's not a notice)
  

diff --combined lib/noticelist.php
index dd4c4a1881b22590091868d8bac97408244e6677,ccdd57feb300543a16a3497ad07c2564e2a07fb9..6f4d1c04e02597fba97f80eaf7cf1e6802d92bef
--- 1/lib/noticelist.php
--- 2/lib/noticelist.php
+++ b/lib/noticelist.php
@@@ -31,6 -31,9 +31,9 @@@ if (!defined('LACONICA')) 
      exit(1);
  }
  
+ require_once INSTALLDIR.'/lib/favorform.php';
+ require_once INSTALLDIR.'/lib/disfavorform.php';
+ 
  /**
   * widget for displaying a list of notices
   *
@@@ -343,7 -346,7 +346,7 @@@ class NoticeListItem extends Widge
              $noticeurl = $this->notice->uri;
          }
          $this->out->elementStart('dl', 'timestamp');
 -        $this->out->element('dt', _('Published')); 
 +        $this->out->element('dt', null, _('Published')); 
          $this->out->elementStart('dd', null);
          $this->out->elementStart('a', array('rel' => 'bookmark',
                                          'href' => $noticeurl));