More CSS fixes

main/css/base.css

@@ -37,12 +37,16 @@ legend {
     width:165px;
 }
 
+#header1 {
+    height: 50px;
+} 
 #header2 .nav{
     margin-bottom:0px;
 }
 
 #header2 {    
     width:100%;
+    height: 35px;
 }
 
 #header2 .nav {
@@ -291,7 +295,7 @@ footer {
 }
 
 #topbar_push {
-    height:40px;
+    height: 55px;
 }
 .actions {	
 	background:#efefef;
@@ -338,20 +342,22 @@ footer {
     margin-top:0px;
 }
 
-
 /* Begin of proper */
 
-#header3 {
-    float:none;
-    position:relative;
-}
-
 #header4 {
     height: 26px !important; /* breadcrumb fix */
+    margin-top:5px;
 }
 
-#submain {
-    padding:5px 10px 10px 10px;
+.show-grid [class*="span"] {
+    background-color: #EEEEEE;
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+    line-height: 30px;
+    min-height: 30px;
+    text-align: center;
 }
 
 a.tag {
@@ -1327,11 +1333,10 @@ button.next.disabled, .a_button.disabled {
     box-shadow: 0 -1px 10px 2px #CCCCCC;
     border:1px solid #CCCCCC;
     float:left;
-    margin:10px;
+    margin:10px 0px 10px 0px;
     padding:12px;
-    width:95%;
-    /* min-height:294px; */
-    color: #BBBBBB; 
+    width:90%;    
+    color: #bbb; 
 }
 
 .categories-content-course {

main/css/base_chamilo.css

@@ -43,7 +43,6 @@ body {
 
 #submain {
     border: 1px solid #ccc;        
-    position: relative; /* to avoid the IE peekabo bug*/
     margin: 0px auto;
     min-height: 320px;   
     -moz-border-radius:0px 0px 10px 10px;
@@ -284,7 +283,6 @@ input.link_alike:hover {
 	padding:0px;
     font-size:12px;    
     color:#666666;    
-    height:53px;
     background-repeat:repeat-x;
 }
 #header1 a {
@@ -333,18 +331,6 @@ input.link_alike:hover {
 	margin-right: 2px;
 }
 
-#header3 .banner_links {
-    margin: 0;
-}
-#header3 input:hover {
-    color: #999;
-    -moz-border-radius-bottomleft:5px;
-    -moz-border-radius-bottomright:5px;
-    -moz-border-radius-topleft:5px;
-    -moz-border-radius-topright:5px;
-    border:1px solid #E1E1E0;
-}
-
 /* HEADER 4:      */
 
 #header4 {
@@ -393,9 +379,6 @@ input.link_alike:hover {
 */
 #menu-wrapper {
     display: block;    
-    float: right;
-    width: 220px;    
-    
     background-color: #F3F4F5;
     border-bottom: 1px solid #CCCCCC;
     border-bottom-left-radius: 5px;
@@ -403,7 +386,6 @@ input.link_alike:hover {
     box-shadow: -3px 3px 32px 0 #E8E8E8;
     color: #595959;
     margin-bottom: 1em;    
-    margin-left: 15px;
     min-height: 20px;
     padding-bottom: 20px;
 }
@@ -967,7 +949,6 @@ div.system_announcement {
 .system_announcements {
     padding-top: 10px;
     padding-bottom: 10px;    
-    margin-left:8px;
 }
 .system_announcements h3 {
     padding-left:70px;
@@ -2317,12 +2298,8 @@ span.form_required  {
 #header3 {
     font-size: 14px;
     font-weight: bold;
-    margin-bottom: 5px;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 0;
-    padding-bottom: 0;    
-    position: relative;
+    margin:0px;
+    
 }
 
 /* Scroll effect */

main/inc/lib/course.lib.php

@@ -2888,8 +2888,6 @@ class CourseManager {
         $key = 0;
         $status_icon = '';
             
-        echo '<div class="row">';
-        
         // Browse through all courses.
         while ($course = Database::fetch_array($result)) {
             // Get notifications.
@@ -2985,7 +2983,6 @@ class CourseManager {
             echo '</div>';
             $key++;
         }        
-        echo '</div>';
     }
     
     /**

main/inc/lib/javascript/bxslider/bx_styles/bx_styles.css

@@ -29,9 +29,9 @@
 
 #container-slider {
     margin: 15px auto;
-    min-height: 310px;
+    min-height: 200px;
     padding: 0 0 0 6%;
-    width: 560px;
+    width: 500px;
     z-index: 0;
 }
 .bx-next {

main/template/default/layout/layout_1_col.tpl

@@ -1,9 +1,9 @@
 {extends file="default/layout/main.tpl"}
 
 {* Header *}
-{block name=header}
+{block name="main_header"}
 	{if $show_header == 1}
-		{include file="default/layout/header.tpl"}
+		{include file="default/layout/main_header.tpl"}
 	{/if}	
 {/block}
 
@@ -27,7 +27,7 @@
 
 {* Footer *}
 {block name=footer}
-	{if $show_header == 1}
-		{include file="default/layout/footer.tpl"}
+	{if $show_footer == 1}
+		{include file="default/layout/main_footer.tpl"}
 	{/if}	
 {/block}

main/template/default/layout/layout_2_col.tpl

@@ -1,7 +1,9 @@
 {extends file="default/layout/main.tpl"}
 
 {block name=header}
-	{include file="default/layout/header.tpl"}
+    {if $show_header == 1 }
+        {include file="default/layout/main_header.tpl"}
+    {/if}
 {/block}
 
 {block name=body}	
@@ -49,7 +51,7 @@
 	</div>
 		
 	{* Right column *}
-	<div id="menu-wrapper" class="span3">
+	<div class="span3">
 		
 	    {*if user is not login show the login form*}
 		{if $_u.logged == 0}
@@ -86,5 +88,7 @@
 
 {* Footer *}
 {block name=footer}
-	{include file="default/layout/footer.tpl"}	
+    {if $show_footer == 1 }
+        {include file="default/layout/main_footer.tpl"}
+    {/if}
 {/block}

main/template/default/layout/main.tpl

@@ -1,7 +1,9 @@
-{* html -> skip *}
-{include file="default/layout/main_header.tpl"}
+{* header *}
 
+{block name="header"}{/block}
+
+{* body *}
 {block name="body"}{/block}
 
 {* footer *}
-{include file="default/layout/main_footer.tpl"}
+{block name="footer"}{/block}

main/template/default/layout/main_footer.tpl

@@ -1,9 +1,8 @@
-<div class="clear">&nbsp;</div> <!-- 'clearing' div to make sure that footer stays below the main and right column sections -->
+            <div class="clear">&nbsp;</div> <!-- 'clearing' div to make sure that footer stays below the main and right column sections -->
         </div> <!-- end of #main" started at the end of banner.inc.php -->
-
     </div> <!-- end of #main" started at the end of banner.inc.php -->
     <div class="push"></div>
 </div> <!-- end of #wrapper section -->
-{block name="footer"}{/block}
+{include file="default/layout/footer.tpl"}
 </body>
 </html>

main/template/default/layout/main_header.tpl

@@ -11,25 +11,41 @@
 		<li><a href="#content" accesskey="2">{"WCAGGoContent"|get_lang}</a></li>
 	</ul>
 </div>
+    
 <div id="wrapper">
     {* Bug and help notifications *}		
     <ul id="navigation">
         {$help_content}
         {$bug_notification_link}
     </ul>    
-    {include file="default/layout/header.tpl"}
+    
+    {*topbar*}
+    {include file="default/layout/topbar.tpl"}
     
     <div id="main" class="container">        
-        {* menu *}
+        <header> 
+            {* header1 - logo *}
+            <div id="header1">                
+                {$header1}
+            </div> 
+            
+            {$plugin_header}    
+
+            {* header 2 - right menu (notifications) *}    
+            <div id="header2">
+                <ul class="nav nav-pills">        
+                    {$header2}
+                </ul>
+            </div>
+        </header>
 
+        {* header 3 - menu *}
         {if $header3}
-        <div id="header3">
-            <div class="subnav">        
+            <div id="header3" class="subnav">        
                 {$header3}    
             </div>        
-        </div>
         {/if}
 
         {* breadcrumb *}
         {$header4}
-        <div id="submain">           
+        <div id="submain-content" class="row">

main/template/default/layout/topbar.tpl

@@ -94,20 +94,3 @@
     }
 </style>
 {/if}
-    
-<div id="header" class="container">
-    
-    {* header *}
-    <div id="header1">
-        {$header1}
-    </div>
-    
-    {$plugin_header}    
-    
-    {* header 2 *}
-    <div id="header2">
-        <ul class="nav nav-pills">        
-            {$header2}
-        </ul>
-    </div>
-</div>

main/template/experimental/layout/layout_2_col.tpl

@@ -1,7 +1,8 @@
 {extends file="default/layout/main.tpl"}
 
-{block name=header}
-	{include file="default/layout/header.tpl"}
+
+{block name="header"}
+	{include file="default/layout/main_header.tpl"}
 {/block}
 
 {block name=body}
@@ -12,7 +13,7 @@
 		{$announcements_block}
 	</div>
 	
-	<div id="menu-wrapper">	
+	<div>	
 		{$login_block}
 		{$profile_block}	
 		{$account_block}