]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 79bc768)
pulled <head> out into page shell also
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 12 Feb 2011 01:40:15 +0000 (01:40 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 12 Feb 2011 01:40:15 +0000 (01:40 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8134 36083f99-b078-4883-b0ff-0f9b5a30f544

views/default/page/elements/head.php patch | blob | history
views/default/page/shells/admin.php patch | blob | history
views/default/page/shells/default.php patch | blob | history
views/default/page/shells/walled_garden.php patch | blob | history

diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 0cd3284c891db1dd9172e5ad73ab48555935434c..5772d0d2413de9b37c94143a464f46c074e033c1 100644 (file)
--- 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 cdad2cfb34e385fef3b969ee82d4b33d3ec3addc..f401f3416c1939541a46a7f8e3e43857cc05224e 100644 (file)
--- 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 9046e289bda3dc997224e07407cc7e48d2f02539..e089d11b610f8be95268a5ea222da3c536d0551c 100644 (file)
--- 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 faa0cea5470021f4c04a03d55b16ddca1a9be28c..4677ac9a644752cdab38603fbe05ed9eea521f64 100644 (file)
--- 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;}
Social Networking Engine