'type' => 'text/css',
'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
'media' => 'screen, projection, tv'));
+ $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
+ 'href="'.theme_path('css/ie.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
foreach (array(6,7) as $ver) {
if (file_exists(theme_file('ie'.$ver.'.css'))) {
// Yes, IE people should be put in jail.
$this->comment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
- 'href="'.theme_path('ie'.$ver.'.css').'?version='.LACONICA_VERSION.'" /><![endif]');
+ 'href="'.theme_path('css/ie'.$ver.'.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
}
}
}
$this->showLogo();
$this->showPrimaryNav();
$this->showSiteNotice();
- if (common_logged_in()) {
- $this->showNoticeForm();
- } else {
- $this->showAnonymousMessage();
- }
+ if (common_logged_in()) {
+ $this->showNoticeForm();
+ } else {
+ $this->showAnonymousMessage();
+ }
$this->elementEnd('div');
}
function showLogo()
{
$this->elementStart('address', array('id' => 'site_contact',
- 'class' => 'vcard'));
+ 'class' => 'vcard'));
$this->elementStart('a', array('class' => 'url home bookmark',
- 'href' => common_local_url('public')));
+ 'href' => common_local_url('public')));
if (common_config('site', 'logo') || file_exists(theme_file('logo.png')))
{
$this->element('img', array('class' => 'logo photo',
{
$this->elementStart('dl', array('id' => 'site_nav_global_primary'));
$this->element('dt', null, _('Primary site navigation'));
- $this->elementStart('dd');
+ $this->elementStart('dd');
$user = common_current_user();
$this->elementStart('ul', array('class' => 'nav'));
if ($user) {
$this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
- _('Home'));
+ _('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
}
- $this->menuItem(common_local_url('peoplesearch'), _('Search'));
+ $this->menuItem(common_local_url('peoplesearch'),
+ _('Search'), _('Search for people or text'), false, 'nav_search');
if ($user) {
$this->menuItem(common_local_url('profilesettings'),
- _('Settings'));
- $this->menuItem(common_local_url('invite'),
- _('Invite'));
+ _('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
+ $this->menuItem(common_local_url('imsettings'),
+ _('Connect'), _('Connect to IM, SMS, Twitter'), false, 'nav_connect');
$this->menuItem(common_local_url('logout'),
- _('Logout'));
+ _('Logout'), _('Logout from the site'), false, 'nav_logout');
} else {
- $this->menuItem(common_local_url('login'), _('Login'));
+ $this->menuItem(common_local_url('login'),
+ _('Login'), _('Login to the site'), false, 'nav_login');
if (!common_config('site', 'closed')) {
- $this->menuItem(common_local_url('register'), _('Register'));
+ $this->menuItem(common_local_url('register'),
+ _('Register'), _('Create an account'), false, 'nav_register');
}
- $this->menuItem(common_local_url('openidlogin'), _('OpenID'));
+ $this->menuItem(common_local_url('openidlogin'),
+ _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
}
$this->menuItem(common_local_url('doc', array('title' => 'help')),
- _('Help'));
+ _('Help'), _('Help me!'), false, 'nav_help');
$this->elementEnd('ul');
- $this->elementEnd('dd');
+ $this->elementEnd('dd');
$this->elementEnd('dl');
}
// Revist. Should probably do an hAtom pattern here
function showSiteNotice()
{
- $text = common_config('site', 'notice');
- if ($text) {
- $this->elementStart('dl', array('id' => 'site_notice',
- 'class' => 'system_notice'));
- $this->element('dt', null, _('Site notice'));
- $this->element('dd', null, $text);
- $this->elementEnd('dl');
- }
+ $text = common_config('site', 'notice');
+ if ($text) {
+ $this->elementStart('dl', array('id' => 'site_notice',
+ 'class' => 'system_notice'));
+ $this->element('dt', null, _('Site notice'));
+ $this->element('dd', null, $text);
+ $this->elementEnd('dl');
+ }
}
-
+
// MAY overload if no notice form needed... or direct message box????
function showNoticeForm()
function showAnonymousMessage()
{
- // needs to be defined by the class
+ // needs to be defined by the class
}
-
+
function showCore()
{
$this->elementStart('div', array('id' => 'core'));
+ $this->showLocalNavBlock();
+ $this->showContentBlock();
+ $this->showAside();
+ $this->elementEnd('div');
+ }
+
+ function showLocalNavBlock()
+ {
$this->elementStart('dl', array('id' => 'site_nav_local_views'));
$this->element('dt', null, _('Local views'));
$this->elementStart('dd');
$this->showLocalNav();
$this->elementEnd('dd');
$this->elementEnd('dl');
- $this->showContentBlock();
- $this->showAside();
- $this->elementEnd('div');
}
// SHOULD overload
function showPageNoticeBlock()
{
- $this->elementStart('dl', array('id' => 'page_notice',
- 'class' => 'system_notice'));
- $this->element('dt', null, _('Page notice'));
- $this->elementStart('dd');
- $this->showPageNotice();
- $this->elementEnd('dd');
- $this->elementEnd('dl');
+ $this->elementStart('dl', array('id' => 'page_notice',
+ 'class' => 'system_notice'));
+ $this->element('dt', null, _('Page notice'));
+ $this->elementStart('dd');
+ $this->showPageNotice();
+ $this->elementEnd('dd');
+ $this->elementEnd('dl');
}
// SHOULD overload (unless there's not a notice)
function showPageNotice()
{
}
-
+
// MUST overload
function showContent()
$this->elementStart('dd', null);
$this->elementStart('ul', array('class' => 'nav'));
$this->menuItem(common_local_url('doc', array('title' => 'help')),
- _('Help'));
+ _('Help'));
$this->menuItem(common_local_url('doc', array('title' => 'about')),
- _('About'));
+ _('About'));
$this->menuItem(common_local_url('doc', array('title' => 'faq')),
- _('FAQ'));
+ _('FAQ'));
$this->menuItem(common_local_url('doc', array('title' => 'privacy')),
- _('Privacy'));
+ _('Privacy'));
$this->menuItem(common_local_url('doc', array('title' => 'source')),
- _('Source'));
+ _('Source'));
$this->menuItem(common_local_url('doc', array('title' => 'contact')),
- _('Contact'));
+ _('Contact'));
$this->elementEnd('ul');
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->element('img', array('id' => 'license_cc',
'src' => common_config('license', 'image'),
'alt' => common_config('license', 'title')));
- $this->text(_('All criti.ca content and data are available under the '));
+ //TODO: This is dirty: i18n
+ $this->text(_('All '.common_config('site', 'name').' content and data are available under the '));
$this->element('a', array('class' => 'license',
'rel' => 'external license',
'href' => common_config('license', 'url')),
// For comparison with If-Last-Modified
// If not applicable, return null
- function last_modified()
+ function lastModified()
{
return null;
}
function handle($argarray=null)
{
- $lm = $this->last_modified();
+ $lm = $this->lastModified();
$etag = $this->etag();
if ($etag) {
$ims = strtotime($if_modified_since);
if ($lm <= $ims) {
if (!$etag ||
- $this->_has_etag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) {
+ $this->_hasEtag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) {
header('HTTP/1.1 304 Not Modified');
// Better way to do this?
exit(0);
}
}
- function _has_etag($etag, $if_none_match)
+ function _hasEtag($etag, $if_none_match)
{
return ($if_none_match) && in_array($etag, explode(',', $if_none_match));
}
if ($is_selected) {
$lattrs['class'] = 'current';
}
- $this->elementStart('li', (is_null($id)) ? $lattrs : $lattr['id'] = $id);
+
+ (is_null($id)) ? $lattrs : $lattrs['id'] = $id;
+
+ $this->elementStart('li', $lattrs);
$attrs['href'] = $url;
if ($title) {
$attrs['title'] = $title;
projects / quix0rs-gnu-social.git / blobdiff