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

Fixing exercise buttons and labels see #4540

Browse Source
skala
Julio Montoya 14 years ago
parent 27d66436f1
commit b966024f9a
5 changed files with 34 additions and 68 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. 29
      main/css/base.css
  2. 39
      main/exercice/exercise.class.php
  3. 17
      main/exercice/exercise_reminder.php
  4. 15
      main/exercice/exercise_submit.php
  5. 2
      main/exercice/overview.php

29
main/css/base.css
Unescape View File

@ -2662,12 +2662,8 @@ div.admin_section h4 {
.question_no_answer { .question_no_answer {
background-color: #FFF7C0; background-color: #FFF7C0;
padding: 5px 0px 5px 0px; /* padding: 5px 0px 5px 0px; */
margin: 5px 0px 5px 0px; margin: 10px 0px 5px 0px;
}
.exercise_reminder_container {
} }
.question_answer { .question_answer {
@ -2687,26 +2683,16 @@ div.admin_section h4 {
width: 88%; width: 88%;
} }
.exercise_actions {
background: #f5f5f5;
margin-top: 18px;
margin-bottom: 18px;
padding: 17px 20px 18px 50px;
border-top: 1px solid #ddd;
-webkit-border-radius: 0 0 3px 3px;
-moz-border-radius: 0 0 3px 3px;
border-radius: 0 0 3px 3px;
}
.exercise_save_now_button img { .exercise_save_now_button img {
position: relative; position: relative;
top: 4px; top: 4px;
} }
.exercise_actions a, .exercise_actions div {
margin-right:10px; .exercise_save_now_button {
margin-top:10px;
} }
.exercise_save_now_button, .exercise_button{ .exercise_save_now_button, .exercise_button{
/* padding:10px; */ /* padding:5px; */
} }
.red_alert { .red_alert {
@ -2715,7 +2701,6 @@ div.admin_section h4 {
color:red; color:red;
} }
#question_feedback { #question_feedback {
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
-moz-border-radius: 10px; -moz-border-radius: 10px;

39
main/exercice/exercise.class.php
Unescape View File

@ -1570,65 +1570,50 @@ class Exercise {
$all_button = ''; $all_button = '';
if ($this->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT && $this->type == ONE_PER_PAGE) { if ($this->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT && $this->type == ONE_PER_PAGE) {
$html .='<script>
$(function() {
$(".button").button();
});
</script>';
$html .='<a href="exercise_submit_modal.php?learnpath_id='.$safe_lp_id.'&learnpath_item_id='.$safe_lp_item_id.'&learnpath_item_view_id='.$safe_lp_item_view_id.'&origin='.$origin.'&hotspot='.$hotspot_get.'&nbrQuestions='.$nbrQuestions.'&questionnum='.$questionNum.'&exerciseType='.$this->type.'&exerciseId='.$this->id.'&placeValuesBeforeTB_=savedValues&TB_iframe=true&height=480&width=640&modal=true" title="" class="thickbox button" id="validationButton">'; $html .='<a href="exercise_submit_modal.php?learnpath_id='.$safe_lp_id.'&learnpath_item_id='.$safe_lp_item_id.'&learnpath_item_view_id='.$safe_lp_item_view_id.'&origin='.$origin.'&hotspot='.$hotspot_get.'&nbrQuestions='.$nbrQuestions.'&questionnum='.$questionNum.'&exerciseType='.$this->type.'&exerciseId='.$this->id.'&placeValuesBeforeTB_=savedValues&TB_iframe=true&height=480&width=640&modal=true" title="" class="thickbox button" id="validationButton">';
$html .= get_lang('ValidateAnswer').'</a>'; $html .= get_lang('ValidateAnswer').'</a>';
$html .='<br />'; $html .='<br />';
} else { } else {
//User //User
if (api_is_allowed_to_session_edit()) { if (api_is_allowed_to_session_edit()) {
if ($this->type == ALL_ON_ONE_PAGE || $nbrQuestions == $questionNum) { if ($this->type == ALL_ON_ONE_PAGE || $nbrQuestions == $questionNum) {
if ($this->review_answers) { if ($this->review_answers) {
$label = get_lang('ReviewQuestions'); $label = get_lang('ReviewQuestions');
$class = 'a_button blue medium'; $class = 'btn btn-primary';
} else { } else {
$label = get_lang('ValidateAnswers'); $label = get_lang('ValidateAnswers');
$class = 'a_button green'; $class = 'btn btn-sucess';
} }
} else { } else {
$label = get_lang('NextQuestion'); $label = get_lang('NextQuestion');
$class = 'a_button blue medium'; $class = 'btn btn-primary';
} }
if ($this->type == ONE_PER_PAGE) { if ($this->type == ONE_PER_PAGE) {
if ($questionNum != 1) { if ($questionNum != 1) {
$prev_question = $questionNum - 2; $prev_question = $questionNum - 2;
$all_button .= '<a href="javascript://" class="a_button white medium" onclick="previous_question('.$prev_question.'); ">'.get_lang('PreviousQuestion').'</a>'; $all_button .= '<a href="javascript://" class="btn" onclick="previous_question('.$prev_question.'); ">'.get_lang('PreviousQuestion').'</a>';
} }
//Next question //Next question
$all_button .= '<a href="javascript://" class="'.$class.'" onclick="save_now('.$question_id.'); ">'.$label.'</a>'; $all_button .= '&nbsp;<a href="javascript://" class="'.$class.'" onclick="save_now('.$question_id.'); ">'.$label.'</a>';
//$all_button .= '&nbsp;<span id="save_all_reponse"></span>';
$all_button .= '<span id="save_for_now_'.$question_id.'"></span>&nbsp;'; $all_button .= '<span id="save_for_now_'.$question_id.'"></span>&nbsp;';
$html .= $all_button; $html .= $all_button;
} else { } else {
if ($this->review_answers) { if ($this->review_answers) {
$all_label = get_lang('ReviewQuestions'); $all_label = get_lang('ReviewQuestions');
$class = 'a_button blue medium'; $class = 'btn btn-primary';
} else { } else {
$all_label = get_lang('ValidateAnswers'); $all_label = get_lang('ValidateAnswers');
$class = 'a_button green'; $class = 'btn btn-sucess';
} }
$all_button = '<a href="javascript://" class="'.$class.'" onclick="validate_all(); ">'.$all_label.'</a>'; $all_button = '&nbsp;<a href="javascript://" class="'.$class.'" onclick="validate_all(); ">'.$all_label.'</a>';
$all_button .= '&nbsp;<span id="save_all_reponse"></span>'; $all_button .= '&nbsp;<span id="save_all_reponse"></span>';
$html .= $all_button; $html .= $all_button;
} }
} }
} }
return $html;
$html = Display::span($html, array('class'=>'exercise_button'));
return $html;
} }
/** /**

17
main/exercice/exercise_reminder.php
Unescape View File

@ -207,12 +207,12 @@ foreach ($question_list as $questionId) {
$attributes['checked'] = 1; $attributes['checked'] = 1;
} }
$label_attributes = array(); $label_attributes = array();
$label_attributes['class'] = ''; $label_attributes['class'] = 'checkbox';
$label_attributes['for'] = $check_id; $label_attributes['for'] = $check_id;
//Check if the question doesn't have an answer //Check if the question doesn't have an answer
if (!in_array($questionId, $exercise_result)) { if (!in_array($questionId, $exercise_result)) {
$label_attributes['class'] = "question_no_answer"; $label_attributes['class'] = "checkbox question_no_answer";
} }
$checkbox = Display::input('checkbox', 'remind_list['.$questionId.']', '', $attributes); $checkbox = Display::input('checkbox', 'remind_list['.$questionId.']', '', $attributes);
@ -225,20 +225,19 @@ foreach ($question_list as $questionId) {
} else { } else {
$question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40); $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
} }
$question_title = Display::tag('label', $question_title, $label_attributes); $question_title = Display::tag('label', $checkbox.$question_title, $label_attributes);
$table .= Display::div($checkbox.$question_title, array('class'=>'exercise_reminder_item')); $table .= Display::div($question_title, array('class'=>'exercise_reminder_item'));
} // end foreach() block that loops over all questions } // end foreach() block that loops over all questions
echo Display::div($table, array('class'=>'exercise_reminder_container')); echo Display::div($table, array('class'=>'span10'));
$exercise_actions = Display::url(get_lang('ValidateAnswers'), 'javascript://', array('onclick'=>'final_submit();', 'class'=>'a_button green')); $exercise_actions = Display::url(get_lang('ValidateAnswers'), 'javascript://', array('onclick'=>'final_submit();', 'class'=>'btn btn-success'));
$exercise_actions .= Display::url(get_lang('ReviewQuestions'), 'javascript://', array('onclick'=>'review_questions();','class'=>'a_button white medium ')); $exercise_actions .= '&nbsp;'.Display::url(get_lang('ReviewQuestions'), 'javascript://', array('onclick'=>'review_questions();','class'=>'btn'));
echo Display::div('', array('class'=>'clear')); echo Display::div('', array('class'=>'clear'));
echo Display::div($exercise_actions, array('class'=>'form-actions'));
echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
if ($origin != 'learnpath') { if ($origin != 'learnpath') {

15
main/exercice/exercise_submit.php
Unescape View File

@ -1012,17 +1012,14 @@ if (!empty($error)) {
if ($objExercise->type == ALL_ON_ONE_PAGE) { if ($objExercise->type == ALL_ON_ONE_PAGE) {
$button = '<a href="javascript://" class="a_button orange medium" onclick="save_now(\''.$questionId.'\'); ">'.get_lang('SaveForNow').'</a>'; $button = '<a href="javascript://" class="a_button orange medium" onclick="save_now(\''.$questionId.'\'); ">'.get_lang('SaveForNow').'</a>';
$button .= '<span id="save_for_now_'.$questionId.'"></span>&nbsp;'; $button .= '<span id="save_for_now_'.$questionId.'"></span>&nbsp;';
$exercise_actions .= Display::span($button, array('class'=>'exercise_save_now_button')); $exercise_actions .= Display::div($button, array('class'=>'exercise_save_now_button'));
} }
if ($objExercise->review_answers) { if ($objExercise->review_answers) {
$remind_question_div = Display::input('checkbox', 'remind_list['.$questionId.']', '', $attributes); $remind_question_div .= Display::tag('label', Display::input('checkbox', 'remind_list['.$questionId.']', '', $attributes).get_lang('ReviewQuestionLater'), array('class' => 'checkbox', 'for' =>'remind_list['.$questionId.']'));
$remind_question_div .= Display::tag('label', get_lang('ReviewQuestionLater'), array('for' =>'remind_list['.$questionId.']')); $exercise_actions .= Display::div($remind_question_div, array('class'=>'exercise_save_now_button'));
$exercise_actions .= Display::span($remind_question_div, array('class'=>'exercise_save_now_button')); }
} echo Display::div($exercise_actions, array('class'=>'form-actions'));
echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
echo '</div>'; echo '</div>';
$i++; $i++;

2
main/exercice/overview.php
Unescape View File

@ -93,7 +93,7 @@ if (isset($exercise_stat_info['exe_id'])) {
$attempt_list = get_all_exercise_event_by_exe_id($exercise_stat_info['exe_id']); $attempt_list = get_all_exercise_event_by_exe_id($exercise_stat_info['exe_id']);
} }
$exercise_url_button = Display::url($label, $exercise_url, array('class'=>'a_button blue bigger round')); $exercise_url_button = Display::url($label, $exercise_url, array('class'=>'btn btn-primary btn-large'));
$visible_return = $objExercise->is_visible($learnpath_id, $learnpath_item_id, null, false); $visible_return = $objExercise->is_visible($learnpath_id, $learnpath_item_id, null, false);

Write Preview
Loading…
Cancel
Save