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

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/action.php b/lib/action.php
index 773b0dce9..d106ba366 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -306,8 +306,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('div', array('id' => 'content'));
         $this->showPageTitle();
         $this->showPageNotice();
+        $this->elementStart('div', array('id' => 'content_inner'));
+        // show the actual content (forms, lists, whatever)
         $this->showContent();
         $this->elementEnd('div');
+        $this->elementEnd('div');
     }
 
     function showPageTitle() {
@@ -331,9 +334,6 @@ class Action extends HTMLOutputter // lawsuit
 
     function showContent()
     {
-        // show the actual content (forms, lists, whatever)
-        $this->elementStart('div', array('id' => 'content_inner'));
-        $this->elementEnd('div');
     }
 
     function showAside()