We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit d6d9a0a9 authored by sarven's avatar sarven

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

parents 8b345981 a72ae0f4
......@@ -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');
}
}
......@@ -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()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment