[svn r19660] minor changes in hotspot and css ejercises see FS#3991

skala
Carlos Vargas 16 years ago
parent 8805ef6ca8
commit 419122fb1e
  1. 1
      main/css/academica/default.css
  2. 1
      main/css/baby_orange/default.css
  3. 1
      main/css/corporate/default.css
  4. 1
      main/css/cosmic_campus/default.css
  5. 1
      main/css/dokeos_classic/default.css
  6. 1
      main/css/dokeos_classic_2D/default.css
  7. 1
      main/css/medical/default.css
  8. 3
      main/css/public_admin/default.css
  9. 1
      main/css/silver_line/default.css
  10. 1
      main/css/sober_brown/default.css
  11. 2
      main/exercice/exercise_admin.php
  12. 10
      main/exercice/hotspot_admin.inc.php
  13. 16
      main/exercice/question.class.php
  14. 2
      main/gradebook/lib/fe/evalform.class.php
  15. 2
      main/upload/upload.scorm.php

@ -1837,6 +1837,7 @@ button.back {
.icon_image_content{ .icon_image_content{
width:70px; width:70px;
cursor:hand;
height:5em; height:5em;
text-align: center; text-align: center;
padding-top: 3px; padding-top: 3px;

@ -1840,6 +1840,7 @@ button.back {
.icon_image_content{ .icon_image_content{
width:70px; width:70px;
cursor:hand;
height:5em; height:5em;
text-align: center; text-align: center;
padding-top: 3px; padding-top: 3px;

@ -1832,6 +1832,7 @@ button.back {
.icon_image_content{ .icon_image_content{
width:70px; width:70px;
cursor:hand;
height:5em; height:5em;
text-align: center; text-align: center;
padding-top: 3px; padding-top: 3px;

@ -1858,6 +1858,7 @@ button.back {
.icon_image_content{ .icon_image_content{
width:70px; width:70px;
cursor:hand;
height:5em; height:5em;
text-align: center; text-align: center;
padding-top: 3px; padding-top: 3px;

@ -2280,6 +2280,7 @@ button.back {
.icon_image_content{ .icon_image_content{
width:70px; width:70px;
cursor:hand;
height:5em; height:5em;
text-align: center; text-align: center;
padding-top: 3px; padding-top: 3px;

@ -2965,6 +2965,7 @@ button.back {
.icon_image_content{ .icon_image_content{
width:70px; width:70px;
cursor:hand;
height:5em; height:5em;
text-align: center; text-align: center;
padding-top: 3px; padding-top: 3px;

@ -2341,6 +2341,7 @@ button.back {
.icon_image_content{ .icon_image_content{
width:70px; width:70px;
cursor:hand;
height:5em; height:5em;
text-align: center; text-align: center;
padding-top: 3px; padding-top: 3px;

@ -2373,7 +2373,8 @@ button.back {
.icon_image_content{ .icon_image_content{
width:70px; width:70px;
height:5em; cursor:hand;
height:8em;
text-align: center; text-align: center;
padding-top: 3px; padding-top: 3px;
padding-right: 5x; padding-right: 5x;

@ -2451,6 +2451,7 @@ button.back {
.icon_image_content{ .icon_image_content{
width:70px; width:70px;
cursor:hand;
height:5em; height:5em;
text-align: center; text-align: center;
padding-top: 3px; padding-top: 3px;

@ -2427,6 +2427,7 @@ button.back {
.icon_image_content{ .icon_image_content{
width:70px; width:70px;
cursor:hand;
height:5em; height:5em;
text-align: center; text-align: center;
padding-top: 3px; padding-top: 3px;

@ -49,7 +49,9 @@ $htmlHeadXtra[] = '<script>
if(document.getElementById(\'options\').style.display == \'none\') { if(document.getElementById(\'options\').style.display == \'none\') {
document.getElementById(\'options\').style.display = \'block\'; document.getElementById(\'options\').style.display = \'block\';
document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;<img src="../img/div_hide.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'\'; document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;<img src="../img/div_hide.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'\';
} else { } else {
document.getElementById(\'options\').style.display = \'none\'; document.getElementById(\'options\').style.display = \'none\';
document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;<img src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'\'; document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;<img src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'\';
} }

@ -301,15 +301,7 @@ if($modifyAnswers)
<button type="submit" class="minus" name="lessAnswers" value="<?php echo get_lang('LessHotspots'); ?>" ><?php echo get_lang('LessHotspots'); ?></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="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(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;" ><?php echo get_lang('Cancel'); ?></button> <button type="submit" class="cancel" name="cancelAnswers" value="<?php echo get_lang('Cancel'); ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;" ><?php echo get_lang('Cancel'); ?></button>
<?php if(isset($_GET['hotspotadmin'])) { <button type="submit" class="save" name="submitAnswers" value="<?php echo get_lang('Ok'); ?>" /><?php echo get_lang('SaveQuestion'); ?></button>
$class="save";
$text=get_lang('ModifyQuestion');
} else {
$class="add";
$text=get_lang('AddQuestionToExercise');
}
?>
<button type="submit" class="<?php echo $class;?>" name="submitAnswers" value="<?php echo get_lang('Ok'); ?>" /><?php echo $text; ?></button>
</td> </td>
</tr> </tr>
<tr> <tr>

@ -1,4 +1,4 @@
<?php // $Id: question.class.php 19517 2009-04-02 21:59:06Z cvargas1 $ <?php // $Id: question.class.php 19660 2009-04-08 21:30:20Z cvargas1 $
/* /*
============================================================================== ==============================================================================
@ -28,7 +28,7 @@
* File containing the Question class. * File containing the Question class.
* @package dokeos.exercise * @package dokeos.exercise
* @author Olivier Brouckaert * @author Olivier Brouckaert
* @version $Id: question.class.php 19517 2009-04-02 21:59:06Z cvargas1 $ * @version $Id: question.class.php 19660 2009-04-08 21:30:20Z cvargas1 $
*/ */
@ -996,7 +996,7 @@ abstract class Question
global $fck_attribute; global $fck_attribute;
$fck_attribute = array(); $fck_attribute = array();
$fck_attribute['Width'] = '100%'; $fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300'; $fck_attribute['Height'] = '150px';
$fck_attribute['ToolbarSet'] = 'QuestionDescription'; $fck_attribute['ToolbarSet'] = 'QuestionDescription';
if(is_array($fck_config)){ if(is_array($fck_config)){
@ -1079,8 +1079,9 @@ abstract class Question
echo '<a href="admin.php?newQuestion=yes&answerType='.$i.'">'; echo '<a href="admin.php?newQuestion=yes&answerType='.$i.'">';
echo '<div class="icon_image_content">'; echo '<div class="icon_image_content">';
Display::display_icon($img, $explanation); Display::display_icon($img, $explanation);
echo '</div>'; echo '<br>';
echo '<div class="icon_image_content">'; //echo '</div>';
//echo '<div class="icon_image_content">';
echo $explanation; echo $explanation;
echo '</div>'; echo '</div>';
echo '</a>'; echo '</a>';
@ -1094,8 +1095,9 @@ abstract class Question
echo '<a href="question_pool.php?fromExercise='.$exerciseId.'">'; echo '<a href="question_pool.php?fromExercise='.$exerciseId.'">';
echo '<div id="icon_test" class="icon_image_content">'; echo '<div id="icon_test" class="icon_image_content">';
Display::display_icon('database.gif', get_lang('GetExistingQuestion'), array('align'=>'middle')); Display::display_icon('database.gif', get_lang('GetExistingQuestion'), array('align'=>'middle'));
echo '</div>'; echo '<br>';
echo '<div class="icon_image_content">'; //echo '</div>';
//echo '<div class="icon_image_content">';
echo get_lang('GetExistingQuestion'); echo get_lang('GetExistingQuestion');
echo '</div>'; echo '</div>';
echo '</a>'; echo '</a>';

@ -283,7 +283,7 @@ class EvalForm extends FormValidator
} else { } else {
$this->addElement('checkbox', 'addresult', get_lang('AddResult')); $this->addElement('checkbox', 'addresult', get_lang('AddResult'));
} }
$this->addElement('style_submit_button', 'submit', get_lang('NewEvaluation'),'class="add"'); $this->addElement('style_submit_button', 'submit', get_lang('SaveAssessment'),'class="add"');
} }
/** /**
* Builds a form to edit an evaluation * Builds a form to edit an evaluation

@ -16,7 +16,7 @@ chdir($cwdir);
$error = api_failure::get_last_failure(); $error = api_failure::get_last_failure();
if($error=='not_a_learning_path') if($error=='not_a_learning_path')
{ {
$msg = urlencode(get_lang('UnknownPackageFormat')); $msg = urlencode(get_lang('ScormUnknownPackageFormat'));
}else{ }else{
if (api_get_setting('search_enabled')=='true') { if (api_get_setting('search_enabled')=='true') {
require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php'); require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');

Loading…
Cancel
Save