Move page-generation code from lib/util.php to Action class
We moved the page generation code from lib/util.php to the action class. We also broke up the page generation code into a big recipe, where each element of the page has a corresponding method in the Action class. Action classes can override parts of the recipe to make their custom output, and leave the rest up to the parent class. NOTE: this change BREAKS pretty much everything. lib/action.php probably does not compile, and everything that uses it needs to be fixed to use the new framework. Stay tuned for more fun!
This commit is contained in:
Evan Prodromou
179
lib/util.php
179
lib/util.php
@@ -108,185 +108,6 @@ function common_init_language()
|
||||
}
|
||||
}
|
||||
|
||||
function common_show_header($pagetitle, $callable=null, $data=null, $headercall=null)
|
||||
{
|
||||
|
||||
global $config, $xw;
|
||||
global $action; /* XXX: kind of cheating here. */
|
||||
|
||||
common_start_html();
|
||||
|
||||
common_element_start('head');
|
||||
common_element('title', null,
|
||||
$pagetitle . " - " . $config['site']['name']);
|
||||
common_element('link', array('rel' => 'stylesheet',
|
||||
'type' => 'text/css',
|
||||
'href' => theme_path('display.css') . '?version=' . LACONICA_VERSION,
|
||||
'media' => 'screen, projection, tv'));
|
||||
foreach (array(6,7) as $ver) {
|
||||
if (file_exists(theme_file('ie'.$ver.'.css'))) {
|
||||
// Yes, IE people should be put in jail.
|
||||
$xw->writeComment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
|
||||
'href="'.theme_path('ie'.$ver.'.css').'?version='.LACONICA_VERSION.'" /><![endif]');
|
||||
}
|
||||
}
|
||||
|
||||
common_element('script', array('type' => 'text/javascript',
|
||||
'src' => common_path('js/jquery.min.js')),
|
||||
' ');
|
||||
common_element('script', array('type' => 'text/javascript',
|
||||
'src' => common_path('js/jquery.form.js')),
|
||||
' ');
|
||||
common_element('script', array('type' => 'text/javascript',
|
||||
'src' => common_path('js/xbImportNode.js')),
|
||||
' ');
|
||||
common_element('script', array('type' => 'text/javascript',
|
||||
'src' => common_path('js/util.js?version='.LACONICA_VERSION)),
|
||||
' ');
|
||||
common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
|
||||
'href' => common_local_url('opensearch', array('type' => 'people')),
|
||||
'title' => common_config('site', 'name').' People Search'));
|
||||
|
||||
common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
|
||||
'href' => common_local_url('opensearch', array('type' => 'notice')),
|
||||
'title' => common_config('site', 'name').' Notice Search'));
|
||||
|
||||
if ($callable) {
|
||||
if ($data) {
|
||||
call_user_func($callable, $data);
|
||||
} else {
|
||||
call_user_func($callable);
|
||||
}
|
||||
}
|
||||
common_element_end('head');
|
||||
common_element_start('body', $action);
|
||||
common_element_start('div', array('id' => 'wrap'));
|
||||
common_element_start('div', array('id' => 'header'));
|
||||
common_nav_menu();
|
||||
if ((isset($config['site']['logo']) && is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
|
||||
|| file_exists(theme_file('logo.png')))
|
||||
{
|
||||
common_element_start('a', array('href' => common_local_url('public')));
|
||||
common_element('img', array('src' => isset($config['site']['logo']) ?
|
||||
($config['site']['logo']) : theme_path('logo.png'),
|
||||
'alt' => $config['site']['name'],
|
||||
'id' => 'logo'));
|
||||
common_element_end('a');
|
||||
} else {
|
||||
common_element_start('p', array('id' => 'branding'));
|
||||
common_element('a', array('href' => common_local_url('public')),
|
||||
$config['site']['name']);
|
||||
common_element_end('p');
|
||||
}
|
||||
|
||||
common_element('h1', 'pagetitle', $pagetitle);
|
||||
|
||||
if ($headercall) {
|
||||
if ($data) {
|
||||
call_user_func($headercall, $data);
|
||||
} else {
|
||||
call_user_func($headercall);
|
||||
}
|
||||
}
|
||||
common_element_end('div');
|
||||
common_element_start('div', array('id' => 'content'));
|
||||
}
|
||||
|
||||
function common_show_footer()
|
||||
{
|
||||
global $xw, $config;
|
||||
common_element_end('div'); // content div
|
||||
common_foot_menu();
|
||||
common_element_start('div', array('id' => 'footer'));
|
||||
common_element_start('div', 'laconica');
|
||||
if (common_config('site', 'broughtby')) {
|
||||
$instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
|
||||
} else {
|
||||
$instr = _('**%%site.name%%** is a microblogging service. ');
|
||||
}
|
||||
$instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
|
||||
$output = common_markup_to_html($instr);
|
||||
common_raw($output);
|
||||
common_element_end('div');
|
||||
common_element('img', array('id' => 'cc',
|
||||
'src' => $config['license']['image'],
|
||||
'alt' => $config['license']['title']));
|
||||
common_element_start('p');
|
||||
common_text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
|
||||
common_element('a', array('class' => 'license',
|
||||
'rel' => 'license',
|
||||
'href' => $config['license']['url']),
|
||||
$config['license']['title']);
|
||||
common_text(_('. Contributors should be attributed by full name or nickname.'));
|
||||
common_element_end('p');
|
||||
common_element_end('div');
|
||||
common_element_end('div');
|
||||
common_element_end('body');
|
||||
common_element_end('html');
|
||||
common_end_xml();
|
||||
}
|
||||
|
||||
function common_nav_menu()
|
||||
{
|
||||
$user = common_current_user();
|
||||
common_element_start('ul', array('id' => 'nav'));
|
||||
if ($user) {
|
||||
common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
|
||||
_('Home'));
|
||||
}
|
||||
common_menu_item(common_local_url('peoplesearch'), _('Search'));
|
||||
if ($user) {
|
||||
common_menu_item(common_local_url('profilesettings'),
|
||||
_('Settings'));
|
||||
common_menu_item(common_local_url('invite'),
|
||||
_('Invite'));
|
||||
common_menu_item(common_local_url('logout'),
|
||||
_('Logout'));
|
||||
} else {
|
||||
common_menu_item(common_local_url('login'), _('Login'));
|
||||
if (!common_config('site', 'closed')) {
|
||||
common_menu_item(common_local_url('register'), _('Register'));
|
||||
}
|
||||
common_menu_item(common_local_url('openidlogin'), _('OpenID'));
|
||||
}
|
||||
common_menu_item(common_local_url('doc', array('title' => 'help')),
|
||||
_('Help'));
|
||||
common_element_end('ul');
|
||||
}
|
||||
|
||||
function common_foot_menu()
|
||||
{
|
||||
common_element_start('ul', array('id' => 'nav_sub'));
|
||||
common_menu_item(common_local_url('doc', array('title' => 'help')),
|
||||
_('Help'));
|
||||
common_menu_item(common_local_url('doc', array('title' => 'about')),
|
||||
_('About'));
|
||||
common_menu_item(common_local_url('doc', array('title' => 'faq')),
|
||||
_('FAQ'));
|
||||
common_menu_item(common_local_url('doc', array('title' => 'privacy')),
|
||||
_('Privacy'));
|
||||
common_menu_item(common_local_url('doc', array('title' => 'source')),
|
||||
_('Source'));
|
||||
common_menu_item(common_local_url('doc', array('title' => 'contact')),
|
||||
_('Contact'));
|
||||
common_element_end('ul');
|
||||
}
|
||||
|
||||
function common_menu_item($url, $text, $title=null, $is_selected=false)
|
||||
{
|
||||
$lattrs = array();
|
||||
if ($is_selected) {
|
||||
$lattrs['class'] = 'current';
|
||||
}
|
||||
common_element_start('li', $lattrs);
|
||||
$attrs['href'] = $url;
|
||||
if ($title) {
|
||||
$attrs['title'] = $title;
|
||||
}
|
||||
common_element('a', $attrs, $text);
|
||||
common_element_end('li');
|
||||
}
|
||||
|
||||
function common_timezone()
|
||||
{
|
||||
if (common_logged_in()) {
|
||||
|
||||
Reference in New Issue
Block a user