Merge

main/css/academica/default.css

@@ -112,8 +112,7 @@ input[type=button], input[type=submit] {
 }
 /* header 3 styles */
 #header3 {
-	border-bottom: 1px solid #aeaeae;
-	height:50px;
+	border-bottom: 1px solid #aeaeae;	
 	font-weight: bold;
 	margin: 0;
 	padding: 0;	

main/css/baby_orange/default.css

@@ -111,8 +111,7 @@ input[type=button], input[type=submit] {
 }
 /* header 3 styles */
 #header3 {
-	border-bottom: 1px solid #aeaeae;
-	height:50px;
+	border-bottom: 1px solid #aeaeae;	
 	font-weight: bold;
 	margin: 0;
 	padding: 0;	

main/css/blue_lagoon/default.css

@@ -407,7 +407,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	background-image: url(images/tab-repeat.png);
 	background-position: 0px 0px;
 	background-repeat: repeat-x;/*border: 1px solid green;*/
-	height:41px;	
+	
     padding-left:0px;
     padding-right:0px; 
     width: 100%;
@@ -424,9 +424,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	color: #a8a7a7;
     background: none;
 }
-#header3 ul {
-	PADDING-RIGHT: 10px;
-	PADDING-LEFT: 10px;
+#header3 ul {	
 	PADDING-BOTTOM: 0px;
 	MARGIN: 0px;
 	LIST-STYLE-TYPE: none;

main/css/chamilo_electric_blue/default.css

@@ -24,7 +24,7 @@ a:active {
 }
 
 #header1 {
-    background-image:url(images/bg-header1.gif);
+    /* background-image:url(images/bg-header1.gif); */
 }
 
 

main/css/chamilo_orange/default.css

@@ -24,11 +24,9 @@ a:active {
 }
 
 #header1 {
-    background-image:url(images/bg-header1.gif);
+    /* background-image:url(images/bg-header1.gif); */
 }
 
-
-
 .subnav-fixed {
     position: fixed;
     top: 38px;

main/css/chamilo_red/default.css

@@ -24,7 +24,7 @@ a:active {
 }
 
 #header1 {
-    background-image:url(images/bg-header1.gif);
+    /* background-image:url(images/bg-header1.gif); */
 }
 
 

main/css/chamilo_sport_red/default.css

@@ -104,9 +104,9 @@ a:active {
 }
 
 #header1 {
-    background-image: url("images/bg-header1.gif");
-    border-top: 5px solid #900217;
-    height: 47px;
+    /* background-image: url("images/bg-header1.gif");
+    border-top: 5px solid #900217; */
+    /* height: 47px; */
     margin-bottom: 43px;
 }
 #header3 {

main/css/cool_blue/default.css

@@ -442,9 +442,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 #header3 a:hover {
 	color: #a8a7a7;
 }
-#header3 ul {
-	PADDING-RIGHT: 10px;
-	PADDING-LEFT: 10px;
+#header3 ul {	
 	PADDING-BOTTOM: 0px;
 	MARGIN: 0px;
 	LIST-STYLE-TYPE: none;

main/inc/local.inc.php

@@ -619,7 +619,7 @@ if ($gidReq && $gidReq != $gid) {
       $is_platformAdmin = false; 
       $is_allowedCreateCourse = false;
 
-	if (isset($_user['user_id']) && $_user['user_id'] && ! api_is_anonymous()) // a uid is given (log in succeeded)
+	if (isset($_user['user_id']) && $_user['user_id'] && ! api_is_anonymous()) {
         // a uid is given (log in succeeded)
 		$user_table     = Database::get_main_table(TABLE_MAIN_USER);
 		$admin_table    = Database::get_main_table(TABLE_MAIN_ADMIN);
@@ -661,16 +661,17 @@ if ($gidReq && $gidReq != $gid) {
 			UserManager::update_extra_field_value($_user['user_id'], 'already_logged_in', 'true');
 			api_session_register('is_platformAdmin');
 			api_session_register('is_allowedCreateCourse');
-
-      // If request_uri is setted we have to go further to have course permissions
-      if (empty($_SESSION['request_uri']) || !isset($_SESSION['request_uri'])) {
-        if( $_SESSION['noredirection'] ) {//If we just want to reser  info without redirecting user
-          unset($_SESSION['noredirection']);
-        } else {
-          require_once api_get_path(LIBRARY_PATH).'loginredirection.lib.php';
-          LoginRedirection::redirect();
-      }
-
+            
+            // If request_uri is setted we have to go further to have course permissions
+            if (empty($_SESSION['request_uri']) || !isset($_SESSION['request_uri'])) {
+                if ($_SESSION['noredirection']) {
+                    //If we just want to reser  info without redirecting user
+                    unset($_SESSION['noredirection']);
+                } else {
+                    require_once api_get_path(LIBRARY_PATH).'loginredirection.lib.php';
+                    LoginRedirection::redirect();
+                }
+            }
 		} else {
 			header('location:'.api_get_path(WEB_PATH));
 			//exit("WARNING UNDEFINED UID !! ");

main/template/default/layout/main_header.tpl

@@ -52,5 +52,5 @@
 
         {* breadcrumb *}
         {$breadcrumb}
-        <div id="submain-content" class="row">
+        <div id="submain-content" class="row-fluid">
 {/if}