chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - format code

Browse Source
pull/2458/head
jmontoyaa 8 years ago
parent 6919041abd
commit 03cb1c3773
3 changed files with 36 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      main/exercise/admin.php
  2. 48
      main/inc/lib/exercise.lib.php
  3. 5
      main/template/default/layout/footer.js.tpl

1
main/exercise/admin.php
Unescape View File

@ -441,7 +441,6 @@ if (!$newQuestion && !$modifyQuestion && !$editQuestion && !isset($_GET['hotspot
// if we are in question authoring, display warning to user is feedback not shown at the end of the test -ref #6619 // if we are in question authoring, display warning to user is feedback not shown at the end of the test -ref #6619
// this test to display only message in the question authoring page and not in the question list page too // this test to display only message in the question authoring page and not in the question list page too
// if (is_object($objQuestion) && $objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_EXAM && ($newQuestion || $modifyQuestion || $editQuestion)) {
if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_EXAM) { if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_EXAM) {
echo Display::return_message(get_lang('TestFeedbackNotShown'), 'normal'); echo Display::return_message(get_lang('TestFeedbackNotShown'), 'normal');
} }

48
main/inc/lib/exercise.lib.php
Unescape View File

@ -330,15 +330,17 @@ class ExerciseLib
if ($answerType == UNIQUE_ANSWER_IMAGE) { if ($answerType == UNIQUE_ANSWER_IMAGE) {
if ($show_comment) { if ($show_comment) {
if (empty($comment)) { if (empty($comment)) {
$s .= '<div id="answer'.$questionId.$numAnswer.'" ' $s .= '<div id="answer'.$questionId.$numAnswer.'"
. 'class="exercise-unique-answer-image" style="text-align: center">'; class="exercise-unique-answer-image" style="text-align: center">';
} else { } else {
$s .= '<div id="answer'.$questionId.$numAnswer.'" ' $s .= '<div id="answer'.$questionId.$numAnswer.'"
. 'class="exercise-unique-answer-image col-xs-6 col-sm-12" style="text-align: center">'; class="exercise-unique-answer-image col-xs-6 col-sm-12"
style="text-align: center">';
} }
} else { } else {
$s .= '<div id="answer'.$questionId.$numAnswer.'" ' $s .= '<div id="answer'.$questionId.$numAnswer.'"
. 'class="exercise-unique-answer-image col-xs-6 col-md-3" style="text-align: center">'; class="exercise-unique-answer-image col-xs-6 col-md-3"
style="text-align: center">';
} }
} }
@ -805,7 +807,9 @@ class ExerciseLib
// Id of select is # question + # of option // Id of select is # question + # of option
$s .= '<td width="10%" valign="top" align="center"> $s .= '<td width="10%" valign="top" align="center">
<div class="select-matching"> <div class="select-matching">
<select id="choice_id_'.$current_item.'_'.$lines_count.'" name="choice['.$questionId.']['.$numAnswer.']">'; <select
id="choice_id_'.$current_item.'_'.$lines_count.'"
name="choice['.$questionId.']['.$numAnswer.']">';
// fills the list-box // fills the list-box
foreach ($select_items as $key => $val) { foreach ($select_items as $key => $val) {
@ -829,7 +833,12 @@ class ExerciseLib
$s .= '</select></div></td><td width="5%" class="separate">&nbsp;</td>'; $s .= '</select></div></td><td width="5%" class="separate">&nbsp;</td>';
$s .= '<td width="40%" valign="top" >'; $s .= '<td width="40%" valign="top" >';
if (isset($select_items[$lines_count])) { if (isset($select_items[$lines_count])) {
$s .= '<div class="text-right"><p class="indent">'.$select_items[$lines_count]['letter'].'.&nbsp; '.$select_items[$lines_count]['answer'].'</p></div>'; $s .= '<div class="text-right">
<p class="indent">'.
$select_items[$lines_count]['letter'].'.&nbsp; '.
$select_items[$lines_count]['answer'].'
</p>
</div>';
} else { } else {
$s .= '&nbsp;'; $s .= '&nbsp;';
} }
@ -844,7 +853,8 @@ class ExerciseLib
$s .= '<tr> $s .= '<tr>
<td colspan="2"></td> <td colspan="2"></td>
<td valign="top">'; <td valign="top">';
$s .= '<b>'.$select_items[$lines_count]['letter'].'.</b> '.$select_items[$lines_count]['answer']; $s .= '<b>'.$select_items[$lines_count]['letter'].'.</b> '.
$select_items[$lines_count]['answer'];
$s .= "</td> $s .= "</td>
</tr>"; </tr>";
$lines_count++; $lines_count++;
@ -951,7 +961,8 @@ class ExerciseLib
$s .= <<<HTML $s .= <<<HTML
<tr> <tr>
<td width="45%"> <td width="45%">
<div id="window_{$windowId}" class="window window_left_question window{$questionId}_question"> <div id="window_{$windowId}"
class="window window_left_question window{$questionId}_question">
<strong>$lines_count.</strong> <strong>$lines_count.</strong>
$answer $answer
</div> </div>
@ -1023,7 +1034,8 @@ HTML;
if (isset($select_items[$lines_count])) { if (isset($select_items[$lines_count])) {
$s .= <<<HTML $s .= <<<HTML
<div id="window_{$windowId}_answer" class="window window_right_question"> <div id="window_{$windowId}_answer" class="window window_right_question">
<strong>{$select_items[$lines_count]['letter']}.</strong> {$select_items[$lines_count]['answer']} <strong>{$select_items[$lines_count]['letter']}.</strong>
{$select_items[$lines_count]['answer']}
</div> </div>
HTML; HTML;
} else { } else {
@ -1131,7 +1143,6 @@ HTML;
} }
} }
} }
$questionName = $objQuestionTmp->selectTitle();
$questionDescription = $objQuestionTmp->selectDescription(); $questionDescription = $objQuestionTmp->selectDescription();
// Get the answers, make a list // Get the answers, make a list
@ -1302,12 +1313,16 @@ HOTSPOT;
<div class="btn-group" data-toggle="buttons"> <div class="btn-group" data-toggle="buttons">
<label class="btn btn-default active" <label class="btn btn-default active"
aria-label="'.get_lang('AddAnnotationPath').'"> aria-label="'.get_lang('AddAnnotationPath').'">
<input type="radio" value="0" name="'.$questionId.'-options" autocomplete="off" checked> <input
type="radio" value="0"
name="'.$questionId.'-options" autocomplete="off" checked>
<span class="fa fa-pencil" aria-hidden="true"></span> <span class="fa fa-pencil" aria-hidden="true"></span>
</label> </label>
<label class="btn btn-default" <label class="btn btn-default"
aria-label="'.get_lang('AddAnnotationText').'"> aria-label="'.get_lang('AddAnnotationText').'">
<input type="radio" value="1" name="'.$questionId.'-options" autocomplete="off"> <input
type="radio" value="1"
name="'.$questionId.'-options" autocomplete="off">
<span class="fa fa-font fa-fw" aria-hidden="true"></span> <span class="fa fa-font fa-fw" aria-hidden="true"></span>
</label> </label>
</div> </div>
@ -2287,7 +2302,9 @@ HOTSPOT;
$category_was_added_for_this_test = true; $category_was_added_for_this_test = true;
} }
if (isset($objQuestionTmp->category_list) && !empty($objQuestionTmp->category_list)) { if (isset($objQuestionTmp->category_list) &&
!empty($objQuestionTmp->category_list)
) {
foreach ($objQuestionTmp->category_list as $category_id) { foreach ($objQuestionTmp->category_list as $category_id) {
$category_list[$category_id]['score'] += $my_total_score; $category_list[$category_id]['score'] += $my_total_score;
$category_list[$category_id]['total'] += $my_total_weight; $category_list[$category_id]['total'] += $my_total_weight;
@ -3665,7 +3682,6 @@ EOT;
$answer_id = intval($answer_id); $answer_id = intval($answer_id);
$exercise_id = intval($exercise_id); $exercise_id = intval($exercise_id);
$courseId = api_get_course_int_id($course_code); $courseId = api_get_course_int_id($course_code);
$course_code = Database::escape_string($course_code);
$session_id = intval($session_id); $session_id = intval($session_id);
switch ($question_type) { switch ($question_type) {

5
main/template/default/layout/footer.js.tpl
Unescape View File

@ -93,7 +93,10 @@
// Mediaelement // Mediaelement
if ( {{ show_media_element }} == 1) { if ( {{ show_media_element }} == 1) {
jQuery('video:not(.skip), audio:not(.skip)').mediaelementplayer(/* Options */); $('video:not(.skip), audio:not(.skip)').mediaelementplayer({
success: function(mediaElement, originalNode, instance) {
}
});
} }
// Table highlight. // Table highlight.

Write Preview
Loading…
Cancel
Save