eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
sarven 2009-01-15 22:19:53 +00:00
commit d6d9a0a981
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/public.php
View File

@ -187,6 +187,7 @@ class PublicAction extends Action
function showExportData() function showExportData()
{ {
$this->elementStart('div', array('id' => 'exportdata', 'class' => 'section'));
$fl = new FeedList($this); $fl = new FeedList($this);
$fl->show(array(0 => array('href' => common_local_url('publicrss'), $fl->show(array(0 => array('href' => common_local_url('publicrss'),
'type' => 'rss', 'type' => 'rss',
@ -196,5 +197,6 @@ class PublicAction extends Action
'type' => 'atom', 'type' => 'atom',
'version' => 'Atom 1.0', 'version' => 'Atom 1.0',
'item' => 'publicatom'))); 'item' => 'publicatom')));
$this->elementEnd('div');
} }
} }

6
lib/action.php
View File

@ -306,8 +306,11 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('div', array('id' => 'content')); $this->elementStart('div', array('id' => 'content'));
$this->showPageTitle(); $this->showPageTitle();
$this->showPageNotice(); $this->showPageNotice();
$this->elementStart('div', array('id' => 'content_inner'));
// show the actual content (forms, lists, whatever)
$this->showContent(); $this->showContent();
$this->elementEnd('div'); $this->elementEnd('div');
$this->elementEnd('div');
} }
function showPageTitle() { function showPageTitle() {
@ -331,9 +334,6 @@ class Action extends HTMLOutputter // lawsuit
function showContent() function showContent()
{ {
// show the actual content (forms, lists, whatever)
$this->elementStart('div', array('id' => 'content_inner'));
$this->elementEnd('div');
} }
function showAside() function showAside()