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

diff --git a/actions/login.php b/actions/login.php
index 1044142a3cf7a6664b498c033561db73b9a0ca6b..23ab166769519923d38f18b5f77db5546f431aeb 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -123,9 +123,7 @@ class LoginAction extends Action
         } else {
             $instr = $this->getInstructions();
             $output = common_markup_to_html($instr);
-           $this->elementStart('div', 'instructions');
             $this->raw($output);
-            $this->elementEnd('div');
         }
     }
     

diff --git a/lib/action.php b/lib/action.php
index 9534073ec7f57b5b2257215e068026475bc1aff0..90bb678703268c1d3ea67fd43f4765f697587418 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -340,7 +340,7 @@ class Action extends HTMLOutputter // lawsuit
        $this->showPageNotice();
        $this->elementEnd('dd');
        $this->elementEnd('dl');
-    }
+       }
 
     // SHOULD overload (unless there's not a notice)
 

diff --git a/lib/noticelist.php b/lib/noticelist.php
index ccdd57feb300543a16a3497ad07c2564e2a07fb9..6f4d1c04e02597fba97f80eaf7cf1e6802d92bef 100644 (file)
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -346,7 +346,7 @@ class NoticeListItem extends Widget
             $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));