diff options
Diffstat (limited to 'views/default/page/elements/head.php')
| -rw-r--r-- | views/default/page/elements/head.php | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php index 859326bbe..d4a95b4d0 100644 --- a/views/default/page/elements/head.php +++ b/views/default/page/elements/head.php @@ -9,12 +9,12 @@ if (empty($vars['title'])) { $title = elgg_get_config('sitename'); } else { - $title = elgg_get_config('sitename') . " ยท " . $vars['title']; + $title = elgg_get_config('sitename') . ": " . $vars['title']; } global $autofeed; if (isset($autofeed) && $autofeed == true) { - $url = full_url(); + $url = current_page_url(); if (substr_count($url,'?')) { $url .= "&view=rss"; } else { @@ -36,28 +36,41 @@ $css = elgg_get_loaded_css(); $version = get_version(); $release = get_version(true); ?> -<meta http-equiv="X-UA-Compatible" content="IE=edge" /> -<title><?php echo $title; ?></title> -<?php echo elgg_view('page/elements/shortcut_icon', $vars); ?> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="ElggRelease" content="<?php echo $release; ?>" /> + <meta name="ElggVersion" content="<?php echo $version; ?>" /> + <title><?php echo $title; ?></title> + <?php echo elgg_view('page/elements/shortcut_icon', $vars); ?> + <?php foreach ($css as $link) { ?> <link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" /> <?php } ?> + <?php $ie_url = elgg_get_simplecache_url('css', 'ie'); $ie7_url = elgg_get_simplecache_url('css', 'ie7'); + $ie6_url = elgg_get_simplecache_url('css', 'ie6'); ?> -<!--[if gt IE 7]> - <link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" /> -<![endif]--> -<!--[if IE 7]> - <link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" /> -<![endif]--> + <!--[if gt IE 7]> + <link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" /> + <![endif]--> + <!--[if IE 7]> + <link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" /> + <![endif]--> + <!--[if IE 6]> + <link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" /> + <![endif]--> + <?php foreach ($js as $script) { ?> <script type="text/javascript" src="<?php echo $script; ?>"></script> <?php } ?> + <script type="text/javascript"> -<?php echo elgg_view('js/initialize_elgg'); ?> +// <![CDATA[ + <?php echo elgg_view('js/initialize_elgg'); ?> +// ]]> </script> + <?php echo $feedref; @@ -65,4 +78,4 @@ $metatags = elgg_view('metatags', $vars); if ($metatags) { elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8); echo $metatags; -}
\ No newline at end of file +} |