diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-12 01:40:15 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-12 01:40:15 +0000 |
| commit | 52aaa3ded5302ac312e259a8e101363cdc3b548a (patch) | |
| tree | c2b69d55f4fc5e779f9ff96ec906e2b39a122e97 | |
| parent | 79bc76893ba8721582485b90f76d6185105b6389 (diff) | |
| download | elgg-52aaa3ded5302ac312e259a8e101363cdc3b548a.tar.gz elgg-52aaa3ded5302ac312e259a8e101363cdc3b548a.tar.bz2 | |
pulled <head> out into page shell also
git-svn-id: http://code.elgg.org/elgg/trunk@8134 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | views/default/page/elements/head.php | 14 | ||||
| -rw-r--r-- | views/default/page/shells/admin.php | 2 | ||||
| -rw-r--r-- | views/default/page/shells/default.php | 2 | ||||
| -rw-r--r-- | views/default/page/shells/walled_garden.php | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php index 0cd3284c8..5772d0d24 100644 --- a/views/default/page/elements/head.php +++ b/views/default/page/elements/head.php @@ -1,10 +1,8 @@ <?php /** - * Start html output. - * The standard HTML header that displays across the site + * The standard HTML head * * @uses $vars['title'] The page title - * @uses $vars['body'] The main content of the page */ // Set title @@ -38,8 +36,6 @@ $css = elgg_get_css(); $version = get_version(); $release = get_version(true); ?> -<head> - <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; ?>" /> @@ -56,13 +52,13 @@ foreach ($css as $link) { $ie_url = elgg_view_get_simplecache_url('css', 'ie'); $ie6_url = elgg_view_get_simplecache_url('css', 'ie6'); ?> - <!--[if IE 6]> + <!--[if gt IE 6]> <link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" /> <![endif]--> - - <!--[if gt IE 6]> + <!--[if IE 6]> <link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" /> <![endif]--> + <?php foreach ($js as $script) { ?> @@ -79,5 +75,3 @@ if ($metatags) { echo $metatags; } echo elgg_view('html_head/extend', $vars); -?> -</head> diff --git a/views/default/page/shells/admin.php b/views/default/page/shells/admin.php index cdad2cfb3..f401f3416 100644 --- a/views/default/page/shells/admin.php +++ b/views/default/page/shells/admin.php @@ -15,7 +15,9 @@ header("Content-type: text/html; charset=UTF-8"); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> <?php echo elgg_view('page/elements/head', $vars); ?> +</head> <body> <div class="elgg-page elgg-page-admin"> <?php echo $vars['body']; ?> diff --git a/views/default/page/shells/default.php b/views/default/page/shells/default.php index 9046e289b..e089d11b6 100644 --- a/views/default/page/shells/default.php +++ b/views/default/page/shells/default.php @@ -27,7 +27,9 @@ header("Content-type: text/html; charset=UTF-8"); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> <?php echo elgg_view('page/elements/head', $vars); ?> +</head> <body> <div class="elgg-page elgg-page-classic"> <div class="elgg-page-messages"> diff --git a/views/default/page/shells/walled_garden.php b/views/default/page/shells/walled_garden.php index faa0cea54..4677ac9a6 100644 --- a/views/default/page/shells/walled_garden.php +++ b/views/default/page/shells/walled_garden.php @@ -20,7 +20,9 @@ if (empty($vars['title'])) { // that is called when running as a private network ?> <html> +<head> <?php echo elgg_view('page/elements/head', $vars); ?> +</head> <body> <style type="text/css"> body {background: white;} |