diff --git a/main/exercice/admin.php b/main/exercice/admin.php index 9acb248914..e27590959d 100644 --- a/main/exercice/admin.php +++ b/main/exercice/admin.php @@ -1,4 +1,4 @@ -'; echo Display::return_icon('preview.gif', get_lang('Preview')).''.get_lang('Preview').''; -echo Display::return_icon('lp_quiz.png', get_lang('ModifyExercise')).''.get_lang('ModifyExercise').''; +echo Display::return_icon('edit.gif', get_lang('ModifyExercise')).''.get_lang('ModifyExercise').''; echo ''; diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index 54d5e9bb7a..e16184d4e1 100644 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -25,7 +25,7 @@ * Exercise class: This class allows to instantiate an object of type Exercise * @package dokeos.exercise * @author Olivier Brouckaert -* @version $Id: exercise.class.php 19599 2009-04-07 15:28:35Z cvargas1 $ +* @version $Id: exercise.class.php 19675 2009-04-09 08:46:51Z pcool $ */ @@ -850,7 +850,16 @@ class Exercise if(empty($type)){ $type='full'; } - + // form title + if (!empty($_GET['exerciseId'])) + { + $form_title = get_lang('ModifyExercise'); + } + else + { + $form_title = get_lang('NewEx'); + } + $form->addElement('header', '', $form_title); // title $form -> addElement('text', 'exerciseTitle', get_lang('ExerciseName'),'class="input_titles"'); // fck editor diff --git a/main/exercice/hotpotatoes.php b/main/exercice/hotpotatoes.php index edd8d5c906..e4764e0b04 100644 --- a/main/exercice/hotpotatoes.php +++ b/main/exercice/hotpotatoes.php @@ -22,38 +22,52 @@ * Code for Hotpotatoes integration. * @package dokeos.exercise * @author Istvan Mandak -* @version $Id: hotpotatoes.php 19328 2009-03-25 21:22:36Z aportugal $ +* @version $Id: hotpotatoes.php 19675 2009-04-09 08:46:51Z pcool $ */ // name of the language file that needs to be included $language_file ='exercice'; +// including the global Dokeos file include('../inc/global.inc.php'); -$this_section=SECTION_COURSES; - +// include additional libraries +include_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php'); +include_once(api_get_path(LIBRARY_PATH).'document.lib.php'); +include_once(api_get_path(LIBRARY_PATH).'fileManage.lib.php'); +include_once(api_get_path(LIBRARY_PATH)."pclzip/pclzip.lib.php"); +include("hotpotatoes.lib.php"); -$finish = (!empty($_POST['finish'])?$_POST['finish']:0); -$imgcount = (!empty($_POST['imgcount'])?$_POST['imgcount']:null); -$fld = (!empty($_POST['fld'])?$_POST['fld']:null); +// section (for the tabs) +$this_section=SECTION_COURSES; +// access restriction: only teachers are allowed here +if(!api_is_allowed_to_edit()) +{ + api_not_allowed(); +} -include_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php'); -include_once(api_get_path(LIBRARY_PATH).'document.lib.php'); +// the breadcrumbs $interbreadcrumb[]= array ("url"=>"./exercice.php", "name"=> get_lang('Exercices')); + $is_allowedToEdit=api_is_allowed_to_edit(); +// Database table definitions $dbTable = Database::get_course_table(TABLE_DOCUMENT); + +// setting some variables $baseServDir = $_configuration['root_sys']; $baseServUrl = $_configuration['url_append']."/"; $document_sys_path = api_get_path(SYS_COURSE_PATH).$_course['path']."/document"; $uploadPath = "/HotPotatoes_files"; +$finish = (!empty($_POST['finish'])?$_POST['finish']:0); +$imgcount = (!empty($_POST['imgcount'])?$_POST['imgcount']:null); +$fld = (!empty($_POST['fld'])?$_POST['fld']:null); // if user is allowed to edit -if ($is_allowedToEdit) +if (api_is_allowed_to_edit()) { - include("hotpotatoes.lib.php"); //disable document parsing(?) - obviously deprecated $enableDocumentParsing=false; @@ -70,7 +84,7 @@ if ($is_allowedToEdit) /** display */ // if finish is set; it's because the user came from this script in the first place (displaying hidden "finish" field) -if(($is_allowedToEdit) && (($finish == 0) || ($finish == 2))) +if((api_is_allowed_to_edit()) && (($finish == 0) || ($finish == 2))) //if(($is_allowedToEdit) ) { $nameTools = get_lang('HotPotatoesTests'); @@ -83,12 +97,7 @@ if(($is_allowedToEdit) && (($finish == 0) || ($finish == 2))) // check something else than a string displayd on a button if (strcmp($_POST['submit'],get_lang('Send'))===0) { - /** el kell tarolni <- english please */ - include_once(api_get_path(LIBRARY_PATH).'fileManage.lib.php'); - /*====================================== - FILEMANAGER BASIC VARIABLES DEFINITION - ======================================*/ - include_once(api_get_path(LIBRARY_PATH)."pclzip/pclzip.lib.php"); + //@todo: this value should be moved to the platform admin section $maxFilledSpace = 100000000; @@ -208,21 +217,8 @@ if(($is_allowedToEdit) && (($finish == 0) || ($finish == 2))) } Display::display_header($nameTools,"Exercise"); - $interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices')); - /* -----*/ ?> -
- - - - - -

-
- - - \n\n \n\n"; Display::display_normal_message($dialogBox, false); //main API - echo "\n"; - } - else - { - echo "\n"; } /*-------------------------------------- UPLOAD SECTION --------------------------------------*/ echo "\n", - " - -
\n\n \n\n", "
\n", "\n", "\n", @@ -261,48 +250,33 @@ if(($is_allowedToEdit) && (($finish == 0) || ($finish == 2))) echo " : ", "\n", "
\n";*/ - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
'; - if ($finish==0){ - echo get_lang('DownloadFile').' : '; - } - else{ - echo get_lang('DownloadImg').' : '; - } - echo ''; - echo ''; - echo '
'; - echo ''; - echo ''; - echo '
'; + Display::display_icon('hotpotatoes.jpg','',array('align'=> 'right', 'style' => 'position: absolute; padding-top: 30px; margin-left: 500px;')); + echo '
'.$nameTools.'
'; + echo '
'; + echo '
'; + echo '*'; + if ($finish==0){ + echo get_lang('DownloadFile').' : '; + } + else{ + echo get_lang('DownloadImg').' : '; + } + echo '
'; + echo '
'; + echo ''; + echo '
'; + echo '
'; + + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + ?> -
diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php index 5e0faeb4ef..517db30c35 100644 --- a/main/exercice/question.class.php +++ b/main/exercice/question.class.php @@ -1,4 +1,4 @@ -'; echo '
'; } + + static function get_types_information() + { + return self::$questionTypes; + } } endif; ?> diff --git a/main/exercice/question_admin.inc.php b/main/exercice/question_admin.inc.php index b2b089956a..01e838f9c2 100644 --- a/main/exercice/question_admin.inc.php +++ b/main/exercice/question_admin.inc.php @@ -27,7 +27,7 @@ * It is included from the script admin.php * @package dokeos.exercise * @author Olivier Brouckaert -* @version $Id: question_admin.inc.php 19500 2009-04-02 15:15:56Z cvargas1 $ +* @version $Id: question_admin.inc.php 19675 2009-04-09 08:46:51Z pcool $ */ /* @@ -90,10 +90,6 @@ if(is_object($objQuestion)) * FORM CREATION *********************/ - $objQuestion -> createForm ($form,array('Height'=>150)); - - $objQuestion -> createAnswersForm ($form); - if(isset($_GET['editQuestion'])) { $class="save"; $text=get_lang('ModifyQuestion'); @@ -102,6 +98,20 @@ if(is_object($objQuestion)) $text=get_lang('AddQuestionToExercise'); } + $types_information = $objQuestion->get_types_information(); + $form_title_extra = get_lang($types_information[$_REQUEST['answerType']][1]); + + // form title + $form->addElement('header', '', $text.': '.$form_title_extra); + + + // question form elements + $objQuestion -> createForm ($form,array('Height'=>150)); + + // answer form elements + $objQuestion -> createAnswersForm ($form); + + // submit button $form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"'); $renderer = $form->defaultRenderer(); $renderer->setElementTemplate('
{label}
{element}
','submitQuestion');