Permalink
Browse files

pulled <head> out into page shell also

git-svn-id: http://code.elgg.org/elgg/trunk@8134 36083f99-b078-4883-b0ff-0f9b5a30f544
  • Loading branch information...
1 parent 79bc768 commit 52aaa3ded5302ac312e259a8e101363cdc3b548a @cash cash committed Feb 12, 2011
@@ -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 @@
$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 @@
$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 @@
echo $metatags;
}
echo elgg_view('html_head/extend', $vars);
-?>
-</head>
@@ -15,7 +15,9 @@
?>
<!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']; ?>
@@ -27,7 +27,9 @@
?>
<!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">
@@ -20,7 +20,9 @@
// 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;}

1 comment on commit 52aaa3d

Owner

ewinslow commented on 52aaa3d Feb 12, 2011

So, I'm a big fan of this change -- I might even go so far as to say we should do this for the header/body/footer too.

Please sign in to comment.