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

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Browse Source
This commit is contained in:
Zach Copley 2009-02-13 05:45:06 +00:00
commit c0af950276
2 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
EVENTS.txt
View File

@ -15,6 +15,24 @@ StartSecondaryNav: Showing the secondary nav menu
EndSecondaryNav: At the end of the secondary nav menu EndSecondaryNav: At the end of the secondary nav menu
- $action: the current action - $action: the current action
StartShowStyles: Showing Style links; good place to add UA style resets
- $action: the current action
EndShowStyles: End showing Style links; good place to add custom styles
- $action: the current action
StartShowLaconicaStyles: Showing Laconica Style links
- $action: the current action
EndShowLaconicaStyles: End showing Laconica Style links; good place to add handheld or JavaScript dependant styles
- $action: the current action
StartShowUAStyles: Showing custom UA Style links
- $action: the current action
EndShowUAStyles: End showing custom UA Style links; good place to add user-agent (e.g., filter, -webkit, -moz) specific styles
- $action: the current action
StartShowScripts: Showing JavaScript links StartShowScripts: Showing JavaScript links
- $action: the current action - $action: the current action

43
lib/action.php
View File

@ -151,25 +151,34 @@ class Action extends HTMLOutputter // lawsuit
*/ */
function showStylesheets() function showStylesheets()
{ {
$this->element('link', array('rel' => 'stylesheet', if (Event::handle('StartShowStyles', array($this))) {
'type' => 'text/css', if (Event::handle('StartShowLaconicaStyles', array($this))) {
'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION, $this->element('link', array('rel' => 'stylesheet',
'media' => 'screen, projection, tv')); 'type' => 'text/css',
$this->element('link', array('rel' => 'stylesheet', 'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION,
'type' => 'text/css', 'media' => 'screen, projection, tv'));
'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION, $this->element('link', array('rel' => 'stylesheet',
'media' => 'screen, projection, tv')); 'type' => 'text/css',
$this->comment('[if IE]><link rel="stylesheet" type="text/css" '. 'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
'href="'.theme_path('css/ie.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]'); 'media' => 'screen, projection, tv'));
foreach (array(6,7) as $ver) { Event::handle('EndShowLaconicaStyles', array($this));
if (file_exists(theme_file('css/ie'.$ver.'.css', 'base'))) {
// Yes, IE people should be put in jail.
$this->comment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
'href="'.theme_path('css/ie'.$ver.'.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
} }
if (Event::handle('StartShowUAStyles', array($this))) {
$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('css/ie'.$ver.'.css', 'base'))) {
// Yes, IE people should be put in jail.
$this->comment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
'href="'.theme_path('css/ie'.$ver.'.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
}
}
$this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
'href="'.theme_path('css/ie.css', null).'?version='.LACONICA_VERSION.'" /><![endif]');
Event::handle('EndShowUAStyles', array($this));
}
Event::handle('EndShowStyles', array($this));
} }
$this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
'href="'.theme_path('css/ie.css', null).'?version='.LACONICA_VERSION.'" /><![endif]');
} }
/** /**