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

diff --combined lib/action.php
index 5f6c600b1311f5aee88d85e7abdc8f3d588cdeda,4f0b0def1e3783ea7ddfae79a187023ea70bd748..4b9db465257f9addc4edce9540c9658e491ca19c
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -124,15 -124,15 +124,15 @@@ class Action extends HTMLOutputter // l
      {
          $this->element('link', array('rel' => 'stylesheet',
                                       'type' => 'text/css',
 -                                     'href' => theme_path('display.css', 'base') . '?version=' . LACONICA_VERSION,
 +                                     'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION,
                                       'media' => 'screen, projection, tv'));
          $this->element('link', array('rel' => 'stylesheet',
                                       'type' => 'text/css',
 -                                     'href' => theme_path('thickbox.css', 'base') . '?version=' . LACONICA_VERSION,
 +                                     'href' => theme_path('css/thickbox.css', 'base') . '?version=' . LACONICA_VERSION,
                                       'media' => 'screen, projection, tv'));
          $this->element('link', array('rel' => 'stylesheet',
                                       'type' => 'text/css',
 -                                     'href' => theme_path('display.css', null) . '?version=' . LACONICA_VERSION,
 +                                     'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
                                       'media' => 'screen, projection, tv'));
          foreach (array(6,7) as $ver) {
              if (file_exists(theme_file('ie'.$ver.'.css'))) {
@@@ -271,14 -271,13 +271,14 @@@
          $this->elementStart('dd', null);
          // Output a bunch of paragraphs here
          $this->elementEnd('dd');
 +        $this->elementEnd('dl');
      }
  
      // MAY overload if no notice form needed... or direct message box????
  
      function showNoticeForm()
      {
-         $notice_form = new NoticeForm();
+         $notice_form = new NoticeForm($this);
          $notice_form->show();
      }