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

2 files changed, 5 insertions, 3 deletions

diff --git a/actions/public.php b/actions/public.php
index 62071eccc..5a11cece1 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -187,6 +187,7 @@ class PublicAction extends Action
 
     function showExportData()
     {
+	$this->elementStart('div', array('id' => 'exportdata', 'class' => 'section'));
         $fl = new FeedList($this);
         $fl->show(array(0 => array('href' => common_local_url('publicrss'),
                                    'type' => 'rss',
@@ -196,5 +197,6 @@ class PublicAction extends Action
                                    'type' => 'atom',
                                    'version' => 'Atom 1.0',
                                    'item' => 'publicatom')));
+	$this->elementEnd('div');
     }
 }
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()