From 419122fb1ea1be1c1045fc564de6981502857683 Mon Sep 17 00:00:00 2001
From: Carlos Vargas <carlos.vargas@beeznest.com>
Date: Wed, 8 Apr 2009 23:30:20 +0200
Subject: [PATCH] [svn r19660] minor changes in hotspot and css ejercises see
 FS#3991

---
 main/css/academica/default.css           |  1 +
 main/css/baby_orange/default.css         |  1 +
 main/css/corporate/default.css           |  1 +
 main/css/cosmic_campus/default.css       |  1 +
 main/css/dokeos_classic/default.css      |  1 +
 main/css/dokeos_classic_2D/default.css   |  1 +
 main/css/medical/default.css             |  1 +
 main/css/public_admin/default.css        |  3 ++-
 main/css/silver_line/default.css         |  1 +
 main/css/sober_brown/default.css         |  1 +
 main/exercice/exercise_admin.php         |  2 ++
 main/exercice/hotspot_admin.inc.php      | 10 +---------
 main/exercice/question.class.php         | 16 +++++++++-------
 main/gradebook/lib/fe/evalform.class.php |  2 +-
 main/upload/upload.scorm.php             |  2 +-
 15 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/main/css/academica/default.css b/main/css/academica/default.css
index b9b45139de..71da11dd76 100644
--- a/main/css/academica/default.css
+++ b/main/css/academica/default.css
@@ -1837,6 +1837,7 @@ button.back {
 
 .icon_image_content{
 	width:70px;
+	cursor:hand;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css
index 17a11e0907..f27f5c7c0f 100644
--- a/main/css/baby_orange/default.css
+++ b/main/css/baby_orange/default.css
@@ -1840,6 +1840,7 @@ button.back {
 
 .icon_image_content{
 	width:70px;
+	cursor:hand;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css
index 824f76d1ac..5143b4a11b 100644
--- a/main/css/corporate/default.css
+++ b/main/css/corporate/default.css
@@ -1832,6 +1832,7 @@ button.back {
 
 .icon_image_content{
 	width:70px;
+	cursor:hand;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
diff --git a/main/css/cosmic_campus/default.css b/main/css/cosmic_campus/default.css
index 855ec32fdf..39bd185f5b 100644
--- a/main/css/cosmic_campus/default.css
+++ b/main/css/cosmic_campus/default.css
@@ -1858,6 +1858,7 @@ button.back {
 
 .icon_image_content{
 	width:70px;
+	cursor:hand;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css
index dd0bccd9fa..b25884aff1 100644
--- a/main/css/dokeos_classic/default.css
+++ b/main/css/dokeos_classic/default.css
@@ -2280,6 +2280,7 @@ button.back {
 
 .icon_image_content{
 	width:70px;
+	cursor:hand;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css
index f05f1220a7..fab86e7fde 100644
--- a/main/css/dokeos_classic_2D/default.css
+++ b/main/css/dokeos_classic_2D/default.css
@@ -2965,6 +2965,7 @@ button.back {
 
 .icon_image_content{
 	width:70px;
+	cursor:hand;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
diff --git a/main/css/medical/default.css b/main/css/medical/default.css
index 0d798c3131..693561ea0a 100644
--- a/main/css/medical/default.css
+++ b/main/css/medical/default.css
@@ -2341,6 +2341,7 @@ button.back {
 
 .icon_image_content{
 	width:70px;
+	cursor:hand;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css
index 9fa36deacc..eee3264df2 100644
--- a/main/css/public_admin/default.css
+++ b/main/css/public_admin/default.css
@@ -2373,7 +2373,8 @@ button.back {
 
 .icon_image_content{
 	width:70px;
-	height:5em;
+	cursor:hand;
+	height:8em;
 	text-align: center;
 	padding-top: 3px;
 	padding-right: 5x;
diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css
index fe5ec705ab..a13a739b66 100644
--- a/main/css/silver_line/default.css
+++ b/main/css/silver_line/default.css
@@ -2451,6 +2451,7 @@ button.back {
 
 .icon_image_content{
 	width:70px;
+	cursor:hand;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css
index 478936345d..ac0d9f8580 100644
--- a/main/css/sober_brown/default.css
+++ b/main/css/sober_brown/default.css
@@ -2427,6 +2427,7 @@ button.back {
 
 .icon_image_content{
 	width:70px;
+	cursor:hand;
 	height:5em;
 	text-align: center;
 	padding-top: 3px;
diff --git a/main/exercice/exercise_admin.php b/main/exercice/exercise_admin.php
index d823e6276f..f4d941652d 100644
--- a/main/exercice/exercise_admin.php
+++ b/main/exercice/exercise_admin.php
@@ -49,7 +49,9 @@ $htmlHeadXtra[] = '<script>
 			if(document.getElementById(\'options\').style.display == \'none\') {
 				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').'\';
+
 			} else {
+			
 				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').'\';
 			}	
diff --git a/main/exercice/hotspot_admin.inc.php b/main/exercice/hotspot_admin.inc.php
index efd58c187c..ee6eca06f8 100644
--- a/main/exercice/hotspot_admin.inc.php
+++ b/main/exercice/hotspot_admin.inc.php
@@ -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="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>
-			<?php	if(isset($_GET['hotspotadmin'])) {
-						$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>
+			<button type="submit" class="save" name="submitAnswers" value="<?php echo get_lang('Ok'); ?>" /><?php echo get_lang('SaveQuestion'); ?></button>
 		</td>
 	</tr>
 	<tr>
diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php
index 4e36adc555..5e0faeb4ef 100644
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
@@ -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.
 *	@package dokeos.exercise
 * 	@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;
 		$fck_attribute = array();
 		$fck_attribute['Width'] = '100%';
-		$fck_attribute['Height'] = '300';
+		$fck_attribute['Height'] = '150px';
 		$fck_attribute['ToolbarSet'] = 'QuestionDescription';
 		
 		if(is_array($fck_config)){
@@ -1079,8 +1079,9 @@ abstract class Question
 			echo '<a href="admin.php?newQuestion=yes&answerType='.$i.'">';
 			echo '<div class="icon_image_content">';
 			Display::display_icon($img, $explanation);
-			echo '</div>';
-			echo '<div class="icon_image_content">';
+			echo '<br>';
+			//echo '</div>';
+			//echo '<div class="icon_image_content">';
 			echo $explanation;
 			echo '</div>';
 			echo '</a>';
@@ -1094,8 +1095,9 @@ abstract class Question
 			echo '<a href="question_pool.php?fromExercise='.$exerciseId.'">';	
 		echo '<div id="icon_test"  class="icon_image_content">';
 		Display::display_icon('database.gif', get_lang('GetExistingQuestion'), array('align'=>'middle'));
-		echo '</div>';
-		echo '<div class="icon_image_content">';
+		echo '<br>';
+		//echo '</div>';
+		//echo '<div class="icon_image_content">';
 		echo get_lang('GetExistingQuestion');
 		echo '</div>';
 		echo '</a>';
diff --git a/main/gradebook/lib/fe/evalform.class.php b/main/gradebook/lib/fe/evalform.class.php
index 039cc3c00a..f37a51471c 100644
--- a/main/gradebook/lib/fe/evalform.class.php
+++ b/main/gradebook/lib/fe/evalform.class.php
@@ -283,7 +283,7 @@ class EvalForm extends FormValidator
 		} else {
 			$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
diff --git a/main/upload/upload.scorm.php b/main/upload/upload.scorm.php
index 9e8ea42e29..04f845f670 100644
--- a/main/upload/upload.scorm.php
+++ b/main/upload/upload.scorm.php
@@ -16,7 +16,7 @@ chdir($cwdir);
 $error = api_failure::get_last_failure();
 if($error=='not_a_learning_path')
 {
-        $msg = urlencode(get_lang('UnknownPackageFormat'));
+        $msg = urlencode(get_lang('ScormUnknownPackageFormat'));
 }else{
 	if (api_get_setting('search_enabled')=='true') {
         require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');