From 49c5c5e0ee321c2f34cd35fb93c7834362f0dbe3 Mon Sep 17 00:00:00 2001
From: Eric Marguin <e.marguin@elixir-interactive.com>
Date: Wed, 24 Jan 2007 18:05:21 +0100
Subject: [PATCH] [svn r10878] improves exercises

---
 main/exercice/admin.php          | 18 ++++++++++++------
 main/exercice/exercise_admin.php |  4 ++--
 main/exercice/question.class.php |  4 ++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/main/exercice/admin.php b/main/exercice/admin.php
index 44935a0ae1..42a81cf091 100644
--- a/main/exercice/admin.php
+++ b/main/exercice/admin.php
@@ -60,7 +60,7 @@
 *
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: admin.php 10791 2007-01-19 09:02:48Z elixir_inter $
+* 	@version $Id: admin.php 10878 2007-01-24 17:05:21Z elixir_inter $
 */
 
 
@@ -417,13 +417,19 @@ function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
 // -->
 </script>";
 Display::display_header($nameTools,"Exercise");
-?>
 
-<h4>
-  <?php echo $nameTools; ?>
-</h4>
+$description = $objExercise->selectDescription();
+echo '<h3 style="display:inline">'.$objExercise->selectTitle().'</h3>&nbsp;';
+if(!empty($description))
+{
+	echo '
+	<a href="#" onclick="if(document.getElementById(\'description_box\').style.display==\'block\') document.getElementById(\'description_box\').style.display=\'none\'; else document.getElementById(\'description_box\').style.display=\'block\' ;">
+		('.get_lang('SeeDescription').')
+	</a>
+	<div id="description_box" style="display:none">'.$description.'</div>';
+}
+echo '<br /><br />';
 
-<?php
 if($newQuestion || $editQuestion)
 {
 	// statement management
diff --git a/main/exercice/exercise_admin.php b/main/exercice/exercise_admin.php
index 8a7ffda4ff..d12e2ddd53 100644
--- a/main/exercice/exercise_admin.php
+++ b/main/exercice/exercise_admin.php
@@ -23,7 +23,7 @@
 *	This script allows to manage an exercise. It is included from the script admin.php
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: admin.php 10680 2007-01-11 21:26:23Z pcool $
+* 	@version $Id$
 */
 
 
@@ -40,7 +40,6 @@ include('answer.class.php');
 include('../inc/global.inc.php');
 include('exercise.lib.php');
 $this_section=SECTION_COURSES;
-include_once(api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
 
 if(!api_is_allowed_to_edit())
 {
@@ -52,6 +51,7 @@ if(!api_is_allowed_to_edit())
  * INIT EXERCISE
  *********************/
 
+include_once(api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
 $objExercise = new Exercise();
 
 
diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php
index 0982143e78..108b593206 100644
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
@@ -22,7 +22,7 @@
 *	File containing the Question class.
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: question.class.php 10862 2007-01-24 09:03:15Z elixir_inter $
+* 	@version $Id: question.class.php 10878 2007-01-24 17:05:21Z elixir_inter $
 */
 
 
@@ -819,7 +819,7 @@ abstract class Question
 			</div>';
 			
 		}
-		echo '</div>';
+		echo '</div><div style="clear:both"></div>';
 
 	}
 }