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

11 years ago · cfd5fc6bdd
parent 3ad9dee5e6 77e46bd5a3
commit cfd5fc6bdd
18 changed files with 1034 additions and 30 deletions
--- a/home/home_menu.html
+++ b/home/home_menu.html
@ -1 +1 @@
-<li class="forum-btn"><a href="http://www.chamilo.org/forum" target="_self">Forum</a></li>
+<li class="forum-btn"><a href="http://www.chamilo.org/forum" target="_self">Forum</a></li>
--- a/main/css/academica/default.css
+++ b/main/css/academica/default.css
@ -574,7 +574,6 @@ input.span3, textarea.span3, .uneditable-input.span3 {
    font-weight: bold;
    font-size: 18px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
--- a/main/css/baby_orange/default.css
+++ b/main/css/baby_orange/default.css
@ -508,7 +508,6 @@ input.span3, textarea.span3, .uneditable-input.span3 {
    font-weight: bold;
    font-size: 18px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
--- a/main/css/blue_lagoon/default.css
+++ b/main/css/blue_lagoon/default.css
@ -460,7 +460,6 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f5f6', end
    font-weight: normal;
    font-size: 20px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
--- a/main/css/bootstrap.css
+++ b/main/css/bootstrap.css
@ -2390,7 +2390,7 @@ table .span24 {

 .dropdown-menu {
  position: absolute;
-  top: 100%;
+  top: 33px;
  left: 0;
  z-index: 1000;
  display: none;
--- a/main/css/chamilo/default.css
+++ b/main/css/chamilo/default.css
@ -465,9 +465,6 @@ a.thumbnail:hover{
    text-shadow: none;
 }

-.form-search .btn{
-    margin-left: 5px;
-}
 /* styles for the star rater */
 .star-rating{
    list-style:none;
@ -633,14 +630,11 @@ a.thumbnail:hover{
    font-weight: bold;
    font-size: 20px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
    color: #0191C7;
    font-weight: normal;
-
-
 }
 .page-header {
  border:none;
--- a/main/css/chamilo_electric_blue/default.css
+++ b/main/css/chamilo_electric_blue/default.css
@ -421,7 +421,6 @@ a:active {
    font-weight: bold;
    font-size: 20px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
--- a/main/css/chamilo_green/default.css
+++ b/main/css/chamilo_green/default.css
@ -422,7 +422,6 @@ a:active {
    font-weight: bold;
    font-size: 20px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
--- a/main/css/chamilo_orange/default.css
+++ b/main/css/chamilo_orange/default.css
@ -422,7 +422,6 @@ a:active {
    font-weight: bold;
    font-size: 20px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
--- a/main/css/chamilo_red/default.css
+++ b/main/css/chamilo_red/default.css
@ -422,7 +422,6 @@ a:active {
    font-weight: bold;
    font-size: 20px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
--- a/main/css/chamilo_sport_red/default.css
+++ b/main/css/chamilo_sport_red/default.css
@ -464,7 +464,6 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', end
    font-weight: bold;
    font-size: 20px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
--- a/main/css/cool_blue/default.css
+++ b/main/css/cool_blue/default.css
@ -490,7 +490,6 @@ a.thumbnail:hover{
    font-weight: normal;
    font-size: 20px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
--- a/main/css/corporate/default.css
+++ b/main/css/corporate/default.css
@ -449,7 +449,6 @@ a:active {
    font-weight: normal;
    font-size: 20px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
--- a/main/css/cosmic_campus/default.css
+++ b/main/css/cosmic_campus/default.css
@ -505,7 +505,6 @@ input.span3, textarea.span3, .uneditable-input.span3 {
    font-weight: bold;
    font-size: 18px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
--- a/main/css/journal/default.css
+++ b/main/css/journal/default.css
--- a/main/css/kiddy/default.css
+++ b/main/css/kiddy/default.css
@ -467,7 +467,6 @@ a.thumbnail:hover{
    font-weight: normal;
    font-size: 20px;
    padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
    margin-top: 10px;
@ -570,9 +569,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#efeab3', end
    text-shadow: none;
 }

-.form-search .btn{
-    margin-left: 5px;
-}
+
 /* styles for the star rater */
 .star-rating{
    list-style:none;
--- a/main/exercice/exercise.lib.php
+++ b/main/exercice/exercise.lib.php
@ -2383,6 +2383,8 @@ function display_question_list_by_attempt($objExercise, $exe_id, $save_user_resu
    if ($show_all_but_expected_answer) {
        $exercise_content .= "<div class='normal-message'>".get_lang("ExerciseWithFeedbackWithoutCorrectionComment")."</div>";
    }
+    // Remove audio autoplay from questions on results page - refs BT#7939
+    $exercise_content = preg_replace('/autoplay[\=\".+\"]+/','',$exercise_content);

    echo $total_score_text;
    echo $exercise_content;
--- a/main/exercice/fill_blanks.class.php
+++ b/main/exercice/fill_blanks.class.php
@ -101,6 +101,7 @@ class FillBlanks extends Question
                if (firstTime) {
                    field = document.getElementById("answer");
                    var answer = field.value;
+                    
                } else {
                    var oEditor = FCKeditorAPI.GetInstance("answer");
                    //var answer =  oEditor.GetXHTML(true);
@ -109,15 +110,13 @@ class FillBlanks extends Question

                var blanks = answer.match(/\[[^\]]*\]/g);
                var fields = "<div class=\"control-group\"><label class=\"control-label\">'.get_lang('Weighting').'</label><div class=\"controls\"><table>";
-
                if (blanks!=null) {
                    for (i=0 ; i<blanks.length ; i++){
                        if (document.getElementById("weighting["+i+"]"))
                            value = document.getElementById("weighting["+i+"]").value;
                        else
                            value = "10";
-                        fields += "<tr><td>"+blanks[i]+"</td><td><input style=\"margin-left: 0em;\" size=\"5\" value=\""+value+"\" type=\"text\" id=\"weighting["+i+"]\" name=\"weighting["+i+"]\" /></td></tr>";
-
+                        fields += "<tr><td><label>"+blanks[i]+"</label></td><td><input style=\"margin-left: 0em;\" size=\"5\" value=\""+value+"\" type=\"text\" id=\"weighting["+i+"]\" name=\"weighting["+i+"]\" /></td></tr>";
                    }
                }
                document.getElementById("blanks_weighting").innerHTML = fields + "</table></div></div>";
@ -176,8 +175,13 @@ class FillBlanks extends Question
 		}

 		if ($nb>0) {
-			$answer .= '::';
+		  	$answer .= '::';
 			for($i=0 ; $i<$nb ; ++$i) {
+			        $blankItem = $blanks[0][$i];
+                               $replace = array("[", "]");
+                               $newBlankItem = str_replace($replace, "", $blankItem);
+                               $newBlankItem = "[".trim($newBlankItem)."]";
+                               $answer = str_replace($blankItem, $newBlankItem, $answer);
 				$answer .= $form->getSubmitValue('weighting['.$i.']').',';
 				$this -> weighting += $form->getSubmitValue('weighting['.$i.']');
 			}