Skip to content
This repository
Browse code

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...
commit 52aaa3ded5302ac312e259a8e101363cdc3b548a 1 parent 79bc768
Cash Costello authored February 12, 2011
14  views/default/page/elements/head.php
... ...
@@ -1,10 +1,8 @@
1 1
 <?php
2 2
 /**
3  
- * Start html output.
4  
- * The standard HTML header that displays across the site
  3
+ * The standard HTML head
5 4
  *
6 5
  * @uses $vars['title'] The page title
7  
- * @uses $vars['body'] The main content of the page
8 6
  */
9 7
 
10 8
 // Set title
@@ -38,8 +36,6 @@
38 36
 $version = get_version();
39 37
 $release = get_version(true);
40 38
 ?>
41  
-<head>
42  
-
43 39
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
44 40
 	<meta name="ElggRelease" content="<?php echo $release; ?>" />
45 41
 	<meta name="ElggVersion" content="<?php echo $version; ?>" />
@@ -56,13 +52,13 @@
56 52
 $ie_url = elgg_view_get_simplecache_url('css', 'ie');
57 53
 $ie6_url = elgg_view_get_simplecache_url('css', 'ie6');
58 54
 ?>
59  
-	<!--[if IE 6]>
  55
+	<!--[if gt IE 6]>
60 56
 		<link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
61 57
 	<![endif]-->
62  
-
63  
-	<!--[if gt IE 6]>
  58
+	<!--[if IE 6]>
64 59
 		<link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
65 60
 	<![endif]-->
  61
+
66 62
 <?php
67 63
 foreach ($js as $script) {
68 64
 ?>
@@ -79,5 +75,3 @@
79 75
 	echo $metatags;
80 76
 }
81 77
 echo elgg_view('html_head/extend', $vars);
82  
-?>
83  
-</head>
2  views/default/page/shells/admin.php
@@ -15,7 +15,9 @@
15 15
 ?>
16 16
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
17 17
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  18
+<head>
18 19
 <?php echo elgg_view('page/elements/head', $vars); ?>
  20
+</head>
19 21
 <body>
20 22
 	<div class="elgg-page elgg-page-admin">
21 23
 		<?php echo $vars['body']; ?>
2  views/default/page/shells/default.php
@@ -27,7 +27,9 @@
27 27
 ?>
28 28
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
29 29
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  30
+<head>
30 31
 <?php echo elgg_view('page/elements/head', $vars); ?>
  32
+</head>
31 33
 <body>
32 34
 <div class="elgg-page elgg-page-classic">
33 35
 	<div class="elgg-page-messages">
2  views/default/page/shells/walled_garden.php
@@ -20,7 +20,9 @@
20 20
 // that is called when running as a private network
21 21
 ?>
22 22
 <html>
  23
+<head>
23 24
 <?php echo elgg_view('page/elements/head', $vars); ?>
  25
+</head>
24 26
 <body>
25 27
 	<style type="text/css">
26 28
 	body {background: white;}

1 note on commit 52aaa3d

Evan Winslow
Owner

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.
Something went wrong with that request. Please try again.