Browse Source

Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19

Julio Montoya 11 years ago
parent
commit
509588bc7f

+ 1 - 1
main/css/academica/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/baby_orange/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/blue_lagoon/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/chamilo/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/chamilo_electric_blue/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/chamilo_green/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/chamilo_orange/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/chamilo_red/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/chamilo_sport_red/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/cool_blue/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/corporate/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/cosmic_campus/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/css/kiddy/scorm.css

@@ -432,7 +432,7 @@ opacity: 0.7;
 }
 
 /*STYLES PROCESS LESSION*/
-.inner_lp_toc .scrom_completed {
+.inner_lp_toc .scorm_completed {
     
     background-image: url("images/blue_arrow.png") !important;
     background-position: 250px center !important;

+ 1 - 1
main/messages/new_message.php

@@ -213,7 +213,7 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
 
 		//adding reply mail
 		$user_reply_info = UserManager::get_user_info_by_id($message_reply_info['user_sender_id']);
-		$default['content'] = '<br />'.sprintf(get_lang('XWroteY'), api_get_person_name($user_reply_info['firstname'], $user_reply_info['lastname']), Security::filter_terms($message_reply_info['content']));
+		$default['content'] = '<p><br/></p>'.sprintf(get_lang('XWroteY'), api_get_person_name($user_reply_info['firstname'], $user_reply_info['lastname']), Security::filter_terms($message_reply_info['content']));
 	}
 
 	if (empty($group_id)) {

+ 1 - 1
main/newscorm/js/documentapi.js

@@ -1,4 +1,4 @@
-// JS interface enabling scrom content to use main/document/remote.php easily
+// JS interface enabling scorm content to use main/document/remote.php easily
 // CBlue SPRL, Arnaud Ligot <arnaud@cblue.be>
 
 

+ 7 - 7
main/newscorm/learnpath.class.php

@@ -2959,13 +2959,13 @@ class learnpath
             // Style Status
 
             $class_name = array (
-                'not attempted' => 'scrom_not_attempted',
-                'incomplete'    => 'scrom_incomplete',
-                'failed'        => 'scrom_failed',
-                'completed'     => 'scrom_completed',
-                'passed'        => 'scrom_passed',
-                'succeeded'     => 'scrom_succeeded',
-                'browsed'       => 'scrom_completed',
+                'not attempted' => 'scorm_not_attempted',
+                'incomplete'    => 'scorm_incomplete',
+                'failed'        => 'scorm_failed',
+                'completed'     => 'scorm_completed',
+                'passed'        => 'scorm_passed',
+                'succeeded'     => 'scorm_succeeded',
+                'browsed'       => 'scorm_completed',
             );
 
             $style = 'scorm_item';