UI Improvements

skala
Julio Montoya 14 years ago
parent 6b90406b98
commit 296a2691bf
  1. 12
      main/css/chamilo/default.css
  2. 4
      main/css/chamilo/learnpath.css
  3. 24
      main/exercice/exercise.lib.php
  4. 13
      main/exercice/hotspot_admin.inc.php
  5. 16
      main/exercice/matching.class.php
  6. 16
      main/exercice/multiple_answer.class.php
  7. 12
      main/exercice/multiple_answer_combination.class.php
  8. 16
      main/exercice/unique_answer.class.php

@ -234,8 +234,10 @@ ul#navigation .student-connect a {
.invisible {
color: #999;
}
.courseadminview table td a {
.courseadminview table td a, .Authoringview table td a {
font-weight: bold;
font-size:13px;
margin-left:2px;
}
.Authoringview, .courseadminview, .platformadminview {
@ -1757,19 +1759,19 @@ div.admin_section h4 {
font-weight: bold;
color: #666666;
list-style-type: none;
margin: 5px;
margin: 5px 5px 5px 0px;
padding: 5px;
font-size: 11px;
font-size: 14px;
}
.sectioncomment {
color: #000000;
margin: 5px;
margin: 5px 5px 5px 0px;
padding: 5px;
font-size: 11px;
}
.sectionvalue {
list-style-type: none;
margin: 5px;
margin: 5px 5px 5px 0px;
padding: 5px;
}
/*****************************************************

@ -159,12 +159,12 @@ table.lp_overview th.exercise {
width:50px;
}
table.lp_form input, table.lp_form select, table.lp_form textarea {
background:#F8F8F8;
/* background:#F8F8F8;
border:1px solid #999999;
font-family:Arial, Verdana, Helvetica, sans-serif;
font-size:12px;
padding:1px 2px;
width:300px;
width:300px;*/
}
table.lp_form td.radio input, table.lp_form td.exercise input {
width:auto;

@ -33,8 +33,8 @@ function showQuestion($questionId, $onlyAnswers = false, $origin = false, $curre
return false;
}
$answerType=$objQuestionTmp->selectType();
$pictureName=$objQuestionTmp->selectPicture();
$answerType = $objQuestionTmp->selectType();
$pictureName = $objQuestionTmp->selectPicture();
if ($answerType != HOT_SPOT) {
// Question is not of type hotspot
@ -54,17 +54,16 @@ function showQuestion($questionId, $onlyAnswers = false, $origin = false, $curre
echo $questionName.'</div>';
$s='';
$s.="<table class='exercise_questions' style='margin:4px;padding:2px;'>
<tr><td valign='top' colspan='2'>";
$s.='<table class="exercise_questions" style="margin:4px 4px 4px 0px; padding:2px;">
<tr><td valign="top" colspan="2">';
$questionDescription=text_filter($questionDescription);
$s.=$questionDescription;
$s.="</td></tr></table>";
$s.='</td></tr></table>';
if (!empty($pictureName)) {
$s.="
<tr>
<td align='center' colspan='2'><img src='../document/download.php?doc_url=%2Fimages%2F'".$pictureName."' border='0'></td>
</tr>";
$s.="<tr>
<td align='center' colspan='2'><img src='../document/download.php?doc_url=%2Fimages%2F'".$pictureName."' border='0'></td>
</tr>";
}
}
$s.= '</table>';
@ -297,11 +296,12 @@ function showQuestion($questionId, $onlyAnswers = false, $origin = false, $curre
if (api_is_platform_admin() || api_is_course_admin()) {
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
$course = api_get_course_info();
$doc_id = DocumentManager::get_document_id($course, '/images');
$doc_id = DocumentManager::get_document_id($course, '/images/'.$pictureName);
if (is_numeric($doc_id)) {
$images_folder_visibility = api_get_item_visibility($course,'document', $doc_id, api_get_session_id());
$images_folder_visibility = api_get_item_visibility($course,'document', $doc_id, api_get_session_id());
if (!$images_folder_visibility) {
Display::display_warning_message(get_lang('ChangeTheVisibilityOfTheDocumentImagesFolder'));
//This message is shown only to the course/platform admin if the image is set to visibility = false
Display::display_warning_message(get_lang('ChangeTheVisibilityOfTheCurrentImage'));
}
}
}

@ -272,17 +272,20 @@ if($modifyAnswers)
//ie6 fix
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
?>
<input type="submit" class="minus" name="lessAnswers" value="<?php echo get_lang('LessHotspots'); ?>" >
<input type="submit" class="plus" name="moreAnswers" value="<?php echo get_lang('MoreHotspots'); ?>" />
<input type="submit" class="save" name="submitAnswers" value="<?php echo get_lang('Save'); ?>" />
<input type="submit" class="plus" name="moreAnswers" value="<?php echo get_lang('MoreHotspots'); ?>" />
<input type="submit" class="minus" name="lessAnswers" value="<?php echo get_lang('LessHotspots'); ?>" >
<!--<input type="submit" class="cancel" name="cancelAnswers" value="<?php echo get_lang('Cancel'); ?>" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;" >-->
<input type="submit" class="save" name="submitAnswers" value="<?php echo get_lang('Ok'); ?>" />
<?php
} else {
?>
<button type="submit" class="save" name="submitAnswers" value="<?php echo get_lang('Ok'); ?>" /><?php echo get_lang('AddQuestionToExercise'); ?></button>
<button type="submit" class="plus" name="moreAnswers" value="<?php echo get_lang('MoreHotspots'); ?>" /><?php echo get_lang('MoreHotspots'); ?></button>
<button type="submit" class="minus" name="lessAnswers" value="<?php echo get_lang('LessHotspots'); ?>" ><?php echo get_lang('LessHotspots'); ?></button>
<button type="submit" class="plus" name="moreAnswers" value="<?php echo get_lang('MoreHotspots'); ?>" /><?php echo get_lang('MoreHotspots'); ?></button>
<!--<button type="submit" class="cancel" name="cancelAnswers" value="<?php echo get_lang('Cancel'); ?>" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;" ><?php echo get_lang('Cancel'); ?></button>-->
<button type="submit" class="save" name="submitAnswers" value="<?php echo get_lang('Ok'); ?>" /><?php echo get_lang('AddQuestionToExercise'); ?></button>
<?php
}
?>

@ -200,15 +200,19 @@ class Matching extends Question {
global $text, $class;
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
// setting the save button here and not in the question class.php
$group[] = FormValidator :: createElement('submit','submitQuestion',$text, 'class="'.$class.'"');
$group[] = FormValidator :: createElement ('submit', 'moreOptions',get_lang('AddElem'),'class="plus"');
$group[] = FormValidator :: createElement ('submit', 'lessOptions', get_lang('DelElem'),'class="minus"');
$group[] = FormValidator :: createElement ('submit', 'moreOptions',get_lang('AddElem'),'class="plus"');
// setting the save button here and not in the question class.php
$group[] = FormValidator :: createElement('submit','submitQuestion',$text, 'class="'.$class.'"');
} else {
// setting the save button here and not in the question class.php
$group[] = FormValidator :: createElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
$group[] = FormValidator :: createElement ('style_submit_button', 'moreOptions',get_lang('AddElem'),'class="plus"');
$group[] = FormValidator :: createElement ('style_submit_button', 'lessOptions', get_lang('DelElem'),'class="minus"');
$group[] = FormValidator :: createElement ('style_submit_button', 'moreOptions',get_lang('AddElem'),'class="plus"');
// setting the save button here and not in the question class.php
$group[] = FormValidator :: createElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
}

@ -142,14 +142,18 @@ class MultipleAnswer extends Question {
if ($show_quiz_edition) {
//ie6 fix
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
$form->addElement('submit','submitQuestion',$text, 'class="'.$class.'"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
$form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'),'class="minus"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
$form->addElement('submit','submitQuestion',$text, 'class="'.$class.'"');
} else {
$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="minus"');
$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
// setting the save button here and not in the question class.php
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
// setting the save button here and not in the question class.php
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="minus"');
}
}
$renderer->setElementTemplate('{element}&nbsp;','lessAnswers');

@ -148,14 +148,18 @@ class MultipleAnswerCombination extends Question {
//ie6 fix
if ($show_quiz_edition) {
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
$form->addElement('submit','submitQuestion',$text, 'class="'.$class.'"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
$form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'),'class="minus"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
$form->addElement('submit','submitQuestion',$text, 'class="'.$class.'"');
} else {
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="minus"');
$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
// setting the save button here and not in the question class.php
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
}
}
$renderer->setElementTemplate('{element}&nbsp;','lessAnswers');

@ -248,14 +248,18 @@ class UniqueAnswer extends Question {
//ie6 fix
if ($show_quiz_edition) {
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
$form->addElement('submit','submitQuestion',$text, 'class="'.$class.'"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
$form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'),'class="minus"');
$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
$form->addElement('submit','submitQuestion',$text, 'class="'.$class.'"');
} else {
$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="minus"');
$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
// setting the save button here and not in the question class.php
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
//setting the save button here and not in the question class.php
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="minus"');
}
}
$renderer->setElementTemplate('{element}','submitQuestion');

Loading…
Cancel
Save