From 2590dfd1c1b397bbb7295b42cdf651431a619c3d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 20 Feb 2012 17:37:39 +0100
Subject: [PATCH] Removing white space and a <style> tag

---
 main/template/default/layout/head.tpl         | 10 ++++++----
 main/template/default/layout/layout_1_col.tpl |  7 +++----
 main/template/default/layout/layout_2_col.tpl |  8 ++++----
 main/template/default/layout/main.tpl         |  2 --
 main/template/default/layout/topbar.tpl       | 14 --------------
 5 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/main/template/default/layout/head.tpl b/main/template/default/layout/head.tpl
index 7c8d4b43b0..ef5e6fb1b6 100644
--- a/main/template/default/layout/head.tpl
+++ b/main/template/default/layout/head.tpl
@@ -3,20 +3,22 @@
 <link href="http://www.chamilo.org/team.php" rel="Author" />
 <link href="http://www.chamilo.org" rel="Copyright" />
 
-<!-- <link rel="top"		href="{$_p.web_main}index.php" title="" />
+{* This fires some HTML5 errors *}
+
+<!-- <link rel="top"	href="{$_p.web_main}index.php" title="" />
 <link rel="courses" href="{$_p.web_main}auth/courses.php" title="{"OtherCourses"|get_lang}"/>
 <link rel="profil"  href="{$_p.web_main}auth/profile.php" title="{"ModifyProfile"|get_lang}"/> -->
 
 <meta name="Generator" content="{$_s.software_name} {$_s.system_version|substr:0:1}" />
 
-{* Use the latest engine in ie8/ie9 use google chrome engine if available *}
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+{* Use the latest engine in ie8/ie9 or use google chrome engine if available *}
+<!--[if ie]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><![endif]-->
 
 {* Improve usability in portal devices*}
 <meta name="viewport" content="width=device-width">
 <title>{$title_string}</title>
 
-<style type="text/css" media="screen, projection">
+<style type="text/css" media="screen">
 	/*<![CDATA[*/
 	{$css_style}
 	/*]]>*/
diff --git a/main/template/default/layout/layout_1_col.tpl b/main/template/default/layout/layout_1_col.tpl
index d5c7728ce9..6beb5b6613 100644
--- a/main/template/default/layout/layout_1_col.tpl
+++ b/main/template/default/layout/layout_1_col.tpl
@@ -1,10 +1,9 @@
 {extends file="default/layout/main.tpl"}
-
 {* Header *}
 {block name="header"}
-	{if $show_header}
-		{include file="default/layout/main_header.tpl"}
-	{/if}	
+{if $show_header}
+{include file="default/layout/main_header.tpl"}
+{/if}	
 {/block}
 
 {* 1 column *}
diff --git a/main/template/default/layout/layout_2_col.tpl b/main/template/default/layout/layout_2_col.tpl
index 83c94dd461..85fee43095 100644
--- a/main/template/default/layout/layout_2_col.tpl
+++ b/main/template/default/layout/layout_2_col.tpl
@@ -1,9 +1,9 @@
 {extends file="default/layout/main.tpl"}
-
+{* Header *}
 {block name=header}
-    {if $show_header == 1 }
-        {include file="default/layout/main_header.tpl"}
-    {/if}
+{if $show_header == 1 }
+{include file="default/layout/main_header.tpl"}
+{/if}
 {/block}
 
 {block name=body}	
diff --git a/main/template/default/layout/main.tpl b/main/template/default/layout/main.tpl
index dc5669d3d8..9d6e7f37c3 100644
--- a/main/template/default/layout/main.tpl
+++ b/main/template/default/layout/main.tpl
@@ -1,5 +1,3 @@
-{* header *}
-
 {block name="header"}{/block}
 
 {* body *}
diff --git a/main/template/default/layout/topbar.tpl b/main/template/default/layout/topbar.tpl
index 8dc3fa4b50..71df336c44 100644
--- a/main/template/default/layout/topbar.tpl
+++ b/main/template/default/layout/topbar.tpl
@@ -1,10 +1,5 @@
 <!-- Topbar -->
 {if $show_toolbar == 1}
-    <style>    
-    .subnav-fixed {
-        top:44px;
-    }
-    </style>
     <div id="topbar" class="navbar navbar-fixed-top">
         <div class="navbar-inner">
             <div class="container-fluid">
@@ -82,13 +77,4 @@
         </div><!-- /navbar-inner -->
     </div><!-- /navbar -->
     <div id="topbar_push"></div>
-{else}
-<style>
-    body {
-        padding-top: 0px;
-    }
-    .subnav-fixed {
-        top:-2px;
-    }
-</style>
 {/if}
\ No newline at end of file