Adding lang variables + removing rounded_div CSS class in the progress

main/auth/my_progress.php

@@ -55,24 +55,27 @@ $user_id = api_get_user_id();
 // Code to 
 $course_user_list = CourseManager::get_courses_list_by_user_id($user_id);
 $dates = $issues = '';
-foreach($course_user_list as $course) {    
-    $items = MySpace::get_connections_to_course($user_id, $course['code']);
-    foreach($items as $result) {
-        $login = $result['login']; 
-        $course_info = api_get_course_info($course['code']);
-        $course_image = '<img src="'.$course_info['course_image'].'">';
-        $dates .= '<li><a href="#'.$login.'">'.  api_get_utc_datetime($login).'</a></li>';
-        $issues .= '<li id ="'.$login.'"><div class="row"><div class="span1">'.$course_image.'</div>
-                <div class="span3">Has ingresado al curso <b>'.$course['code'].'</b> el
-            '.  api_convert_and_format_date($login, DATE_FORMAT_LONG).'</div></li>';
-    }    
+if (!empty($course_user_list)) {
+    foreach ($course_user_list as $course) {    
+        $items = MySpace::get_connections_to_course($user_id, $course['code']);
+        foreach($items as $result) {
+            $login = $result['login']; 
+            $course_info = api_get_course_info($course['code']);
+            $course_image = '<img src="'.$course_info['course_image'].'">';
+            $dates .= '<li><a href="#'.$login.'">'.  api_get_utc_datetime($login).'</a></li>';
+            $issues .= '<li id ="'.$login.'"><div class="row"><div class="span1">'.$course_image.'</div>
+                    <div class="span3">'.sprintf(get_lang('YouHaveEnteredTheCourseXInY') , $course['code'], api_convert_and_format_date($login, DATE_FORMAT_LONG)).'</div></li>';
+        }    
+    }
 }
 
 $content .= Tracking::show_user_progress(api_get_user_id());
+$content .= Tracking::show_course_detail(api_get_user_id(), $_GET['course'], $_GET['session_id']);
+
 if (!empty($content)) {
     $content .= '<br /><br />';
 }
-$content .= '<div class="span12"><h2>'.get_lang('Timeline').'</h2></span>';
+$content .= '<div class="row"><div class="span12">'.Display::page_subheader(get_lang('Timeline')).'</div>';
 
 $content .= '<div id="timeline">
    <ul id="dates">
@@ -83,9 +86,7 @@ $content .= '<div id="timeline">
    </ul>
    <a href="#" id="next">+</a> <!-- optional -->
    <a href="#" id="prev">-</a> <!-- optional -->
-   </div>';
-
-$content .= Tracking::show_course_detail(api_get_user_id(), $_GET['course'], $_GET['session_id']);
+   </div></div>';
 
 if (empty($content)) {
     $message = Display::return_message(get_lang('NoDataAvailable'), 'warning');

main/css/base.css

@@ -149,15 +149,12 @@ footer .container .row {
 }
  
 .page-header {
-  margin-bottom: 17px;
+  padding-bottom: 10px;
   border-bottom: 1px solid #ddd;
   -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
   -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
   box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
-.page-header h1 {
-  margin-bottom: 8px;
-}
 
 #topbar_push {
     height: 55px;

main/inc/lib/display.lib.php

@@ -1345,4 +1345,13 @@ class Display {
     function return_default_table_class() {
         return 'data_table';
     }
+    
+    function page_header($title) {
+        return '<div class="page-header"><h1>'.Security::remove_XSS($title).'</h1></div>';
+    }
+    
+    function page_subheader($title) {
+        return '<div class="page-header"><h2>'.Security::remove_XSS($title).'</h2></div>';
+    }
+    
 } //end class Display

main/inc/lib/tracking.lib.php

@@ -2539,17 +2539,12 @@ class Tracking {
 
 					if (!empty($session_graph[$session_id_from_get])) {
 						//$html .= Display::div($session_graph[$session_id_from_get], array('id'=>'session_graph','class'=>'chart-session', 'style'=>'position:relative; text-align: center;') );
-					}
-					
+					}					
 				}
-			}
-			if (!empty($html)) {
-				$html = Display::div($html, array('class'=>'rounded_div', 'style'=>'position:relative; float:none; width:95%'));
-			}
+			}			
 			return $html;
 		}
 
-
 		/**
 		 * Shows the user detail progress (when clicking in the details link)
 		 * @param   int     user id
@@ -2566,10 +2561,10 @@ class Tracking {
 				$course                     = Database::escape_string($course_code);
 				$course_info                = CourseManager::get_course_information($course);
                 
-                $course_id                  = $course_info['real_id'];              				
-				$session_name               = api_get_session_name($session_id);
+                //$course_id                  = $course_info['real_id'];              				
+				//$session_name               = api_get_session_name($session_id);
                 
-				$html .= Display::tag('h2', $course_info['title']);
+				$html .= Display::page_subheader($course_info['title']);
 				
 				$html .= '<table class="data_table" width="100%">';
 						
@@ -2742,10 +2737,7 @@ class Tracking {
 						  </tr>';
 				}
 				$html .='</table>';
-			}
-			if (!empty($html)) {
-				$html = Display::div($html, array('class'=>'rounded_div', 'style'=>'position:relative; float:none; width:95%'));
-			}
+			}			
 			return $html;
 		}